稽查导出格式修改

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

@@ -15,82 +15,82 @@ public class MedicalCheckTitleDTO {
 
     //入院记录未24小时内
     @Excel(name = "入院记录24小时内",orderNum = "1")
-    private Integer ryjlw_24 = 0;
+    private String ryjlw_24 ;
 
     //首次病程记录未8小时内
     @Excel(name = "首次病程记录8小时内",orderNum = "2")
-    private Integer scbcjlw_8h = 0;
+    private String scbcjlw_8h;
 
     @Excel( name = "副主任/主任医师首次查房72小时内完成",orderNum = "3")
     //副主任/主任医师首次查房72小时内未完成
-    private Integer zrsccfw_72h= 0;
+    private String zrsccfw_72h;
 
     //入院后未连记3天病程
     @Excel(name = "入院后连记3天病程(不包括术后首程)",orderNum = "4")
-    private Integer ryhljbcw_3d= 0;
+    private String ryhljbcw_3d;
 
     //每周至少2次副主任/主任医师查房
     @Excel(name = "每周至少2次副主任/主任医师查房",orderNum = "5")
-    private Integer zrcfw_2w= 0;
+    private String zrcfw_2w;
 
     //每周至少3次主治医师查房记录
     @Excel(name = "每周至少3次主治医师查房记录",orderNum = "6")
-    private Integer zzcfw_3w= 0;
+    private String zzcfw_3w;
 
     //抢救记录未6小时内完成
     @Excel(name = "抢救记录6小时内完成",orderNum = "7")
-    private Integer qjjlw_6h= 0;
+    private String qjjlw_6h;
 
     //会诊记录在会诊申请后未24小时完成
     @Excel(name = "会诊记录在会诊申请后24小时完成",orderNum = "8")
-    private Integer hzjlw_24h= 0;
+    private String hzjlw_24h;
 
     //术前讨论、术前小结未完成
     @Excel(name = "术前讨论、术前小结完成",orderNum = "9")
-    private Integer sqtlxjw= 0;
+    private String sqtlxjw;
 
     //手术记录术后24小时内未完成
     @Excel(name = "手术记录术后24小时内完成",orderNum = "10")
-    private Integer sxjlsw_24h= 0;
+    private String sxjlsw_24h;
 
     //术后首程在术后30分钟内未完成
     @Excel(name = "术后首程在术后30分钟内完成",orderNum = "11")
-    private Integer xhscw_30m= 0;
+    private String xhscw_30m;
 
     //术后主刀查房24小时内未完成
     @Excel(name = "术后主刀查房24小时内完成",orderNum = "12")
-    private Integer shzdcfw_24h= 0;
+    private String shzdcfw_24h;
 
     //术后未连记3天病程
     @Excel(name = "术后连记3天病程(包括术后首程)",orderNum = "13")
-    private Integer shjbcw_3d= 0;
+    private String shjbcw_3d;
 
     //转科后未连记3天病程
     @Excel(name = "转科后连记3天病程(包括专科记录)",orderNum = "14")
-    private Integer zkjbcw_3d= 0;
+    private String zkjbcw_3d;
 
     //转接科记录专科后24小时内未完成
     @Excel(name = "转接科记录专科后24小时内完成",orderNum = "15")
-    private Integer zkjlw_24= 0;
+    private String zkjlw_24;
 
     //病危/重患者未每日记录病程
     @Excel(name = "病危/重患者每日记录病程",orderNum = "16")
-    private Integer bwzhjlbcw_md= 0;
+    private String bwzhjlbcw_md;
 
     //输血后未完成输血记录
     @Excel(name = "输血后完成输血记录",orderNum = "17")
-    private Integer sxhwjl= 0;
+    private String sxhwjl;
 
     //24小时未完成输血后评价
     @Excel(name = "24小时完成输血后评价",orderNum = "18")
-    private Integer sxpjw_24= 0;
+    private String sxpjw_24;
 
     //危急值未记录
     @Excel(name = "危急值记录",orderNum = "19")
-    private Integer wjzwjl= 0;
+    private String wjzwjl;
 
     //住院30天未阶段小结
     @Excel(name = "住院30天阶段小结",orderNum = "20")
-    private Integer wywwcxj= 0;
+    private String wywwcxj;
 
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6556,27 +6556,47 @@
         SELECT
         a.beh_dept_id AS deptId,
         a.beh_dept_name AS deptName,
-        a.doctor_name as doctorName,
-        sum(c.cases_entry_id = 2658) as RYJLW_24,
-        sum(c.cases_entry_id = 2686) as SCBCJLW_8H,
-        sum(c.cases_entry_id = 2657) as ZRSCCFW_72H,
-        sum(c.cases_entry_id = 3010) as RYHLJBCW_3D,
-        sum(c.cases_entry_id = 2655) as ZRCFW_2W,
-        sum(c.cases_entry_id = 2654) as ZZCFW_3W,
-        sum(c.cases_entry_id = 2852) as QJJLW_6H,
-        sum(c.cases_entry_id = 2287) as HZJLW_24H,
-        sum(c.cases_entry_id = 3025) as SQTLXJW,
-        sum(c.cases_entry_id = 2170) as SXJLSW_24H,
-        sum(c.cases_entry_id = 2930) as XHSCW_30M,
-        sum(c.cases_entry_id = 2900) as SHZDCFW_24H,
-        sum(c.cases_entry_id = 2229) as SHJBCW_3D,
-        sum(c.cases_entry_id = 2217) as ZKJBCW_3D,
-        sum(c.cases_entry_id = 2218) as ZKJLW_24,
-        sum(c.cases_entry_id = 2220) as BWZHJLBCW_MD,
-        sum(c.cases_entry_id = 2486) as SXHWJL,
-        sum(c.cases_entry_id = 3063) as SXPJW_24,
-        sum(c.cases_entry_id = 3062) as WJZWJL,
-        sum(c.cases_entry_id = 2495) as WYWWCXJ
+        GROUP_CONCAT( DISTINCT a.doctor_name) as doctorName,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2658 THEN  a.behospital_code else null END ) as RYJLW_24,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2686 THEN  a.behospital_code else null END ) as SCBCJLW_8H,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2657 THEN  a.behospital_code else null END ) as ZRSCCFW_72H,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3010 THEN  a.behospital_code else null END ) as RYHLJBCW_3D,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2655 THEN  a.behospital_code else null END ) as ZRCFW_2W,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2654 THEN  a.behospital_code else null END ) as ZZCFW_3W,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2852 THEN  a.behospital_code else null END ) as QJJLW_6H,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2287 THEN  a.behospital_code else null END ) as HZJLW_24H,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3025 THEN  a.behospital_code else null END ) as SQTLXJW,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2170 THEN  a.behospital_code else null END ) as SXJLSW_24H,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2930 THEN  a.behospital_code else null END ) as XHSCW_30M,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2900 THEN  a.behospital_code else null END ) as SHZDCFW_24H,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2229 THEN  a.behospital_code else null END ) as SHJBCW_3D,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2217 THEN  a.behospital_code else null END ) as ZKJBCW_3D,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2218 THEN  a.behospital_code else null END ) as ZKJLW_24,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2220 THEN  a.behospital_code else null END ) as BWZHJLBCW_MD,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2486 THEN  a.behospital_code else null END ) as SXHWJL,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3063 THEN  a.behospital_code else null END ) as SXPJW_24,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3062 THEN  a.behospital_code else null END ) as WJZWJL,
+        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2495 THEN  a.behospital_code else null END ) as WYWWCXJ
+--         sum(c.cases_entry_id = 2658) as RYJLW_24,
+--         sum(c.cases_entry_id = 2686) as SCBCJLW_8H,
+--         sum(c.cases_entry_id = 2657) as ZRSCCFW_72H,
+--         sum(c.cases_entry_id = 3010) as RYHLJBCW_3D,
+--         sum(c.cases_entry_id = 2655) as ZRCFW_2W,
+--         sum(c.cases_entry_id = 2654) as ZZCFW_3W,
+--         sum(c.cases_entry_id = 2852) as QJJLW_6H,
+--         sum(c.cases_entry_id = 2287) as HZJLW_24H,
+--         sum(c.cases_entry_id = 3025) as SQTLXJW,
+--         sum(c.cases_entry_id = 2170) as SXJLSW_24H,
+--         sum(c.cases_entry_id = 2930) as XHSCW_30M,
+--         sum(c.cases_entry_id = 2900) as SHZDCFW_24H,
+--         sum(c.cases_entry_id = 2229) as SHJBCW_3D,
+--         sum(c.cases_entry_id = 2217) as ZKJBCW_3D,
+--         sum(c.cases_entry_id = 2218) as ZKJLW_24,
+--         sum(c.cases_entry_id = 2220) as BWZHJLBCW_MD,
+--         sum(c.cases_entry_id = 2486) as SXHWJL,
+--         sum(c.cases_entry_id = 3063) as SXPJW_24,
+--         sum(c.cases_entry_id = 3062) as WJZWJL,
+--         sum(c.cases_entry_id = 2495) as WYWWCXJ
         FROM
         med_behospital_info a,
         med_qcresult_info b,