fix:1、部门、操作区展示不全，调整展示宽度(完成)

2、禁闭时间支持筛选符合条件的数据（完成）
    3、文化程度修改为下拉框：高中、大专、本科、研究生及以上(完成)
    4、编辑功能：姓名回显不正确 (完成)

src/main/java/com/biutag/supervision/controller/work/ConfinementController.java

@@ -145,6 +145,7 @@ public class ConfinementController {
             if(StrUtil.isNotEmpty(s.getIsVisit())){
                 exPortConfinement.setIsVisit(s.getIsVisit().equals("0")?"是":"否");
             }
+
             return exPortConfinement;
 
         }).toList();

src/main/java/com/biutag/supervision/mapper/NegativeBlameMapper.java

@@ -55,7 +55,8 @@ public interface NegativeBlameMapper extends BaseMapper<NegativeBlame> {
             " and blameIdCode is not null and blameDepartId is not null and length(blameIdCode) > 0 and length(blameDepartId) > 0 and length(blameName) > 0 and ivPersonTypeCode != '1'")
     List<NegativeBlame> selectBlameListNotIvPerson();
 
-    @Select("select  a.handleResultName as resultName, count(*) as resultCount FROM `negative_blame` as a  LEFT JOIN negative as b on a.negativeId = b.id where a.handleResultName is NOT NULL and  a.handleResultCode is NOT NULL  and a.crtTime  BETWEEN #{beginTime} AND #{endTime}  GROUP BY resultName"
+    @Select("select  a.handleResultName as resultName, count(*) as resultCount FROM `negative_blame` as a  LEFT JOIN negative as b on a.negativeId = b.id where a.handleResultName is NOT NULL and  a.handleResultCode is NOT NULL  and b.problemSourcesCode in (21,22,23,24,25) " +
+            " and a.crtTime  BETWEEN #{beginTime} AND #{endTime}  GROUP BY resultName"
     )
     List<BlameStats> selectBlameStatsCount(Date beginTime, Date endTime);
 }

src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java

@@ -1,6 +1,7 @@
 package com.biutag.supervision.pojo.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -34,9 +35,11 @@ public class ExPortConfinement {
     private String confinementTime;
 
     @ExcelProperty({"开始日期"})
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
     private LocalDateTime  startTime;
 
     @ExcelProperty({"结束时间"})
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
     private LocalDateTime  endTime;
 
     @ExcelProperty({"看护单位"})

src/main/java/com/biutag/supervision/service/ConfinementService.java

@@ -50,10 +50,12 @@ public class ConfinementService extends ServiceImpl<ConfinementMapper, Confineme
         queryWrapper.like(StrUtil.isNotBlank(param.getName()), "c1.name", StrUtil.trim(param.getName()))
                 .or().like(StrUtil.isNotBlank(param.getMatter()), "c1.matter", StrUtil.trim(param.getMatter()));
         if (CollectionUtils.isNotEmpty(param.getConfinementTime())) {
-            queryWrapper.le("c1.end_time", param.getConfinementTime().get(1))
+            queryWrapper.le("c1.start_time", param.getConfinementTime().get(1))
                     .ge("c1.start_time", param.getConfinementTime().get(0));
         }
-        //部门的查询条件
+        //部门的查询条件SELECT COUNT(*) AS total FROM confinement AS c1
+        // WHERE (c1.start_time <= '2025-05-01T00:00' AND c1.start_time >= '2025-04-30T00:00')
+        //
         if (StrUtil.isNotEmpty(param.getOrgId())) {
             if (param.getDepartBranch()) {
                 List<String> orgIds = departService.getAllNodeIds(param.getOrgId());