稽查表格式处理

src/main/java/com/diagbot/dto/MedicalCheckDTO.java

@@ -19,100 +19,71 @@ import java.util.Map;
 public class MedicalCheckDTO extends Object {
 
     //科室名称
-    @Excel(name = "科室", width = 20, orderNum = "1")
     private String deptName;
 
     //科室id
     private String deptId;
 
     //医生
-    @Excel(name = "医疗组", width = 11, orderNum = "2")
     private String doctorName;
 
-//    //目标字符串
-//    @JsonIgnore
-//    private String casesEntryId;
-//
-//    //条目id数量
-//    private String numId;
-
     //入院记录未24小时内
-    @Excel(name = "入院记录24小时内", width = 16, orderNum = "3")
     private Integer ryjlw_24 = 0;
 
     //首次病程记录未8小时内
-    @Excel(name = "首次病程记录8小时内", width = 18, orderNum = "4")
     private Integer scbcjlw_8h = 0;
 
-    @Excel(name = "副主任/主任医师首次查房72小时内完成", width = 20, orderNum = "5")
     //副主任/主任医师首次查房72小时内未完成
     private Integer zrsccfw_72h = 0;
 
     //入院后未连记3天病程
-    @Excel(name = "入院后连记3天病程", width = 16, orderNum = "6")
     private Integer ryhljbcw_3d = 0;
 
     //每周未至少2次副主任/主任医师查房
-    @Excel(name = "每周至少2次副主任/主任医师查房", width = 20, orderNum = "7")
     private Integer zrcfw_2w = 0;
 
     //每周未至少3次主治医师查房记录
-    @Excel(name = "每周至少3次主治医师查房记录", width = 20, orderNum = "8")
     private Integer zzcfw_3w = 0;
 
     //抢救记录未6小时内完成
-    @Excel(name = "抢救记录6小时内完成", width = 15, orderNum = "9")
     private Integer qjjlw_6h = 0;
 
     //会诊记录在会诊申请后未24小时完成
-    @Excel(name = "会诊记录在会诊申请后24小时完成", width = 20, orderNum = "10")
     private Integer hzjlw_24h = 0;
 
     //术前讨论、术前小结未完成
-    @Excel(name = "术前讨论、术前小结完成", width = 15, orderNum = "11")
     private Integer sqtlxjw = 0;
 
     //手术记录术后24小时内未完成
-    @Excel(name = "手术记录术后24小时内完成", width = 15, orderNum = "12")
     private Integer sxjlsw_24h = 0;
 
     //术后首程在术后30分钟内未完成
-    @Excel(name = "术后首程在术后30分钟内完成", width = 15, orderNum = "13")
     private Integer xhscw_30m = 0;
 
     //术后主刀查房24小时内未完成
-    @Excel(name = "术后主刀查房24小时内完成", width = 15, orderNum = "14")
     private Integer shzdcfw_24h = 0;
 
     //术后未连记3天病程
-    @Excel(name = "术后连记3天病程(包括术后首程)", width = 15, orderNum = "15")
     private Integer shjbcw_3d = 0;
 
     //转科后未连记3天病程
-    @Excel(name = "转科后连记3天病程(包括专科记录)", width = 15, orderNum = "16")
     private Integer zkjbcw_3d = 0;
 
     //转接科记录专科后24小时内未完成
-    @Excel(name = "转接科记录专科后24小时内完成", width = 15, orderNum = "17")
     private Integer zkjlw_24 = 0;
 
     //病危/重患者未每日记录病程
-    @Excel(name = "病危/重患者每日记录病程", width = 15, orderNum = "18")
     private Integer bwzhjlbcw_md = 0;
 
     //输血后未完成输血记录
-    @Excel(name = "输血后完成输血记录", width = 15, orderNum = "20")
     private Integer sxhwjl = 0;
 
     //24小时未完成输血后评价
-    @Excel(name = "24小时完成输血后评价", width = 15, orderNum = "20")
     private Integer sxpjw_24 = 0;
 
     //危急值未记录
-    @Excel(name = "危急值记录", width = 15, orderNum = "21")
     private Integer wjzwjl = 0;
 
     //住院30天未阶段小结
-    @Excel(name = "住院30天阶段小结", width = 16, orderNum = "22")
     private Integer wywwcxj = 0;
 }

src/main/java/com/diagbot/dto/MedicalCheckExportDTO.java

@@ -19,7 +19,7 @@ import java.util.List;
 public class MedicalCheckExportDTO  {
 
     //科室名称
-    @Excel(name = "科室",needMerge = true,orderNum = "1")
+    @Excel(name = "科室",width = 18,needMerge = true,orderNum = "1")
     private String deptName;
 
     @ExcelCollection(name = "",orderNum = "2")

src/main/java/com/diagbot/dto/MedicalCheckTitleDTO.java

@@ -1,7 +1,6 @@
 package com.diagbot.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,92 +13,84 @@ import lombok.Setter;
 @Setter
 public class MedicalCheckTitleDTO {
 
-   /* //字符串目标id集
-    @Excel(name = "字符串目标id集",isColumnHidden = true)
-    private String casesEntryId;
-
-    //字符串目标条目集
-    @Excel(name = "字符串目标条目集",isColumnHidden = true)
-    private String casesEntryName;
-*/
     //入院记录未24小时内
-    @Excel(name = "入院记录24小时内",width = 16,orderNum = "1")
+    @Excel(name = "入院记录24小时内",orderNum = "1")
     private Integer ryjlw_24 = 0;
 
     //首次病程记录未8小时内
-    @Excel(name = "首次病程记录8小时内",width = 17,orderNum = "2")
+    @Excel(name = "首次病程记录8小时内",orderNum = "2")
     private Integer scbcjlw_8h = 0;
 
-    @Excel(name = "副主任/主任医师首次查房72小时内完成",width = 18,orderNum = "3")
+    @Excel( name = "副主任/主任医师首次查房72小时内完成",orderNum = "3")
     //副主任/主任医师首次查房72小时内未完成
     private Integer zrsccfw_72h= 0;
 
     //入院后未连记3天病程
-    @Excel(name = "入院后连记3天病程(不包括术后首程)",width = 18,orderNum = "4")
+    @Excel(name = "入院后连记3天病程(不包括术后首程)",orderNum = "4")
     private Integer ryhljbcw_3d= 0;
 
     //每周至少2次副主任/主任医师查房
-    @Excel(name = "每周至少2次副主任/主任医师查房",width = 16,orderNum = "5")
+    @Excel(name = "每周至少2次副主任/主任医师查房",orderNum = "5")
     private Integer zrcfw_2w= 0;
 
     //每周至少3次主治医师查房记录
-    @Excel(name = "每周至少3次主治医师查房记录",width = 16,orderNum = "6")
+    @Excel(name = "每周至少3次主治医师查房记录",orderNum = "6")
     private Integer zzcfw_3w= 0;
 
     //抢救记录未6小时内完成
-    @Excel(name = "抢救记录6小时内完成",width = 15,orderNum = "7")
+    @Excel(name = "抢救记录6小时内完成",orderNum = "7")
     private Integer qjjlw_6h= 0;
 
     //会诊记录在会诊申请后未24小时完成
-    @Excel(name = "会诊记录在会诊申请后24小时完成",width = 16,orderNum = "8")
+    @Excel(name = "会诊记录在会诊申请后24小时完成",orderNum = "8")
     private Integer hzjlw_24h= 0;
 
     //术前讨论、术前小结未完成
-    @Excel(name = "术前讨论、术前小结完成",width = 15,orderNum = "9")
+    @Excel(name = "术前讨论、术前小结完成",orderNum = "9")
     private Integer sqtlxjw= 0;
 
     //手术记录术后24小时内未完成
-    @Excel(name = "手术记录术后24小时内完成",width = 15,orderNum = "10")
+    @Excel(name = "手术记录术后24小时内完成",orderNum = "10")
     private Integer sxjlsw_24h= 0;
 
     //术后首程在术后30分钟内未完成
-    @Excel(name = "术后首程在术后30分钟内完成",width = 16,orderNum = "11")
+    @Excel(name = "术后首程在术后30分钟内完成",orderNum = "11")
     private Integer xhscw_30m= 0;
 
     //术后主刀查房24小时内未完成
-    @Excel(name = "术后主刀查房24小时内完成",width = 15,orderNum = "12")
+    @Excel(name = "术后主刀查房24小时内完成",orderNum = "12")
     private Integer shzdcfw_24h= 0;
 
     //术后未连记3天病程
-    @Excel(name = "术后连记3天病程(包括术后首程)",width = 16,orderNum = "13")
+    @Excel(name = "术后连记3天病程(包括术后首程)",orderNum = "13")
     private Integer shjbcw_3d= 0;
 
     //转科后未连记3天病程
-    @Excel(name = "转科后连记3天病程(包括专科记录)",width =16,orderNum = "1")
+    @Excel(name = "转科后连记3天病程(包括专科记录)",orderNum = "14")
     private Integer zkjbcw_3d= 0;
 
     //转接科记录专科后24小时内未完成
-    @Excel(name = "转接科记录专科后24小时内完成",width = 16,orderNum = "14")
+    @Excel(name = "转接科记录专科后24小时内完成",orderNum = "15")
     private Integer zkjlw_24= 0;
 
     //病危/重患者未每日记录病程
-    @Excel(name = "病危/重患者每日记录病程",width = 15,orderNum = "15")
+    @Excel(name = "病危/重患者每日记录病程",orderNum = "16")
     private Integer bwzhjlbcw_md= 0;
 
     //输血后未完成输血记录
-    @Excel(name = "输血后完成输血记录",width = 15,orderNum = "16")
+    @Excel(name = "输血后完成输血记录",orderNum = "17")
     private Integer sxhwjl= 0;
 
     //24小时未完成输血后评价
-    @Excel(name = "24小时完成输血后评价",width = 15,orderNum = "17")
+    @Excel(name = "24小时完成输血后评价",orderNum = "18")
     private Integer sxpjw_24= 0;
 
     //危急值未记录
-    @Excel(name = "危急值记录",width = 15,orderNum = "18")
+    @Excel(name = "危急值记录",orderNum = "19")
     private Integer wjzwjl= 0;
 
     //住院30天未阶段小结
-    @Excel(name = "住院30天阶段小结",width = 16,orderNum = "19")
+    @Excel(name = "住院30天阶段小结",orderNum = "20")
     private Integer wywwcxj= 0;
 
 }

src/main/java/com/diagbot/facade/ConsoleExportFacade.java

@@ -83,7 +83,7 @@ public class ConsoleExportFacade {
             fileName = "运行病历稽查表.xls";
         }
         List<MedicalCheckExportDTO> records = consoleFacade.medicalCheckExport(filterVO);
-        ExcelUtils.exportExcelUser(records, null, "sheet1", MedicalCheckExportDTO.class, fileName, response);
+        ExcelUtils.exportExcel(records, null, "sheet1", MedicalCheckExportDTO.class, fileName, response, 15.8f);
     }
 
     /**

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -48,7 +48,7 @@
         CONCAT( t1.rep_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d %H:%i:%s'),')')as info,
         date_format (t1.rep_date,'%Y-%m-%d %H:%i:%s') as reptTime,
         date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') as checkTime,
-        t2.apply_doctor as doctorName,
+        t1.apply_doctor as doctorName,
         t2.hospital_id as hospitalId,
         t2.behospital_code as behospitalCode,
         t2.rept_diag as checkResult