Merge remote-tracking branch 'origin/dev/20201021_1.4.7' into his/debug

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

@@ -95,12 +95,12 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 最后得分
      */
-    private String scoreRes;
+    private Double scoreRes;
 
     /**
      * 病案首页得分
      */
-    private String scoreBn;
+    private Double scoreBn;
 
     /**
      * 评分类型(1：机器，2：人工)

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

@@ -27,9 +27,9 @@ public class ExportExcelBehospitalDTO {
     @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
     private Date leaveHospitalDate;
     @Excel(name = "分数", needMerge = true)
-    private String score;
+    private Double score;
     @Excel(name = "病案首页分数", needMerge = true)
-    private String scoreBn;
+    private Double scoreBn;
     @ExcelCollection(name = "")
     private List<ExportExcelCaseDTO> exportExcelCaseDTOS;
 

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

@@ -18,7 +18,7 @@ public class ExportExcelDTO {
     @Excel(name = "科室", needMerge = true)
     private String behDeptName;
     @Excel(name = "平均分数", needMerge = true)
-    private String avgScore;
+    private Double avgScore;
     @ExcelCollection(name = "")
     private List<ExportExcelBehospitalDTO> excelBehospitalDTOS;
 

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

@@ -42,7 +42,7 @@ public class HomePageNumDTO {
     /**
      * 质控病历数
      */
-    @Excel(name = "质控病历数", orderNum = "10")
+    @Excel(name = "质控病历数", orderNum = "11")
     private Integer mrNum = 0;
     /**
      * 质控评分（总分）
@@ -51,11 +51,12 @@ public class HomePageNumDTO {
     /**
      * 质控评分（平均分）
      */
-    @Excel(name = "质控平均分", orderNum = "9")
+    @Excel(name = "质控平均分", orderNum = "10")
     private Double averageValue = 0d;
     /**
      * 病案首页合格病历数
      */
+    @Excel(name = "合格数", orderNum = "4")
     private Integer firstLevelNum = 0;
     /**
      * 病案首页合格病历占比
@@ -68,7 +69,7 @@ public class HomePageNumDTO {
     /**
      * 病案首页合格病历占比（百分比）
      */
-    @Excel(name = "合格率", orderNum = "4")
+    @Excel(name = "合格率", orderNum = "5")
     private String firstLevelPercentStr = "0.00%";
     /**
      * 病案首页不合格病历占比（百分比）
@@ -85,12 +86,12 @@ public class HomePageNumDTO {
     /**
      * 空项数
      */
-    @Excel(name = "空项数", orderNum = "5")
+    @Excel(name = "空项数", orderNum = "6")
     private Integer emptyNum = 0;
     /**
      * 错误数
      */
-    @Excel(name = "错误数", orderNum = "7")
+    @Excel(name = "错误数", orderNum = "8")
     private Integer errorNum = 0;
     /**
      * 完整率、完善率分母（质控病历数*病案首页条目数）
@@ -107,11 +108,11 @@ public class HomePageNumDTO {
     /**
      * 完整率（百分比）
      */
-    @Excel(name = "完整率", orderNum = "6")
+    @Excel(name = "完整率", orderNum = "7")
     private String emptyPercentStr = "0.00%";
     /**
      * 完善率（百分比）
      */
-    @Excel(name = "完善率", orderNum = "8")
+    @Excel(name = "完善率", orderNum = "9")
     private String errorPercentStr = "0.00%";
 }

src/main/java/com/diagbot/entity/HomeOperationInfo.java

@@ -93,6 +93,11 @@ public class HomeOperationInfo implements Serializable {
      */
     private String shamOperationName;
 
+    /**
+     * 麻醉医师
+     */
+    private String anaesthesiaDoctor;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

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

@@ -817,10 +817,12 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptStr_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
+        if( StringUtil.isBlank(filterOrderVO.getName())){
             LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
             if (item != null) {
                 records.add(0, item);
             }
+        }
         if(ListUtil.isNotEmpty(records)){
            for (LevelStatisticsTZDTO record : records) {
                BigDecimalStrExport(record);
@@ -839,11 +841,14 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
-            LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
-            if (item != null) {
-                records.add(0, item);
+            if( StringUtil.isBlank(filterOrderVO.getName())){
+                LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
+                if (item != null) {
+                    records.add(0, item);
+                }
             }
 
+
         if(ListUtil.isNotEmpty(records)){
             for (LevelStatisticsTZDTO record : records) {
                 BigDecimalMethod(record);
@@ -1009,14 +1014,17 @@ public class ConsoleFacade {
              sameThirdLevelPercentStr
                     = df.format(BigDecimal.valueOf(sameThirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
         }
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptClass()) || filterOrderVO.getDeptClass().equals("全院")) {
             item.setDeptName("全院");
-        }else if("内科".equals(filterOrderVO.getName())){
-            item.setDeptName("内科系统");
-        }else if("外科".equals(filterOrderVO.getName())){
-            item.setDeptName("外科系统");
+        }else if("内科".equals(filterOrderVO.getDeptClass())){
+            item.setDeptClassId("01");
+            item.setDeptClass("内科");
+            item.setDeptName("全部科室");
+        }else if("外科".equals(filterOrderVO.getDeptClass())){
+            item.setDeptClassId("1030000");
+            item.setDeptClass("外科");
+            item.setDeptName("全部科室");
         }
-
         item.setEntryNum(entryNum);
         item.setSameNum(sameNum);
         item.setMrNum(mrNum);

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -344,6 +344,7 @@
         IFNULL(b.level, '未评分') AS `level`,
         b.grade_type,
         b.score_res,
+        e.score_res as score_bn,
         b.gmt_create AS grade_time,
         c.age
         FROM
@@ -354,6 +355,10 @@
         LEFT JOIN med_qcresult_info b
         ON a.behospital_code = b.behospital_code
         AND b.is_deleted = 'N'
+        LEFT JOIN med_qcresult_cases e
+        on  a.behospital_code = e.behospital_code
+        AND e.is_deleted = 'N'
+        and e.cases_id = 243
         LEFT JOIN med_home_page c
         ON a.behospital_code = c.behospital_code
         AND c.is_deleted = 'N'
@@ -455,6 +460,7 @@
         IFNULL(b.level, '未评分') AS `level`,
         b.grade_type,
         b.score_res,
+        e.score_res as score_bn,
         b.gmt_create AS grade_time,
         c.age
         FROM
@@ -475,14 +481,18 @@
         LEFT JOIN med_qcresult_info b
         ON a.behospital_code = b.behospital_code
         AND b.is_deleted = 'N'
+        LEFT JOIN med_qcresult_cases e
+        on  a.behospital_code = e.behospital_code
+        AND e.is_deleted = 'N'
+        and e.cases_id = 243
         LEFT JOIN med_home_page c
         ON a.behospital_code = c.behospital_code
         AND c.is_deleted = 'N'
-        WHERE CONCAT(
-        IFNULL(a.doctor_name, ''),
-        IFNULL(a.beh_doctor_name, ''),
-        IFNULL(a.director_doctor_name, '')
-        ) = CONCAT('%', u1.linkman, '%')
+        WHERE
+        a.is_deleted = 'N'
+        and  a.doctor_name = u1.linkman
+        or   a.beh_doctor_name = u1.linkman
+        or   a.director_doctor_name =  u1.linkman
         ) t
         LEFT JOIN (SELECT * FROM med_check_info WHERE is_deleted = 'N' AND check_type = 0 ) g
         ON t.behospital_code = g.behospital_code
@@ -563,9 +573,13 @@
         h.check_time AS mr_time
         from (
         select a.*, ifnull(b.level,'未评分') as `level`, b.grade_type, b.score_res, b.gmt_create as
-        grade_time, c.age from med_behospital_info a
+        grade_time, c.age, e.score_res as score_bn from med_behospital_info a
         LEFT JOIN med_qcresult_info b
         on a.behospital_code = b.behospital_code and b.is_deleted = 'N'
+        LEFT JOIN med_qcresult_cases e
+        on  a.behospital_code = e.behospital_code
+        AND e.is_deleted = 'N'
+        and e.cases_id = 243
         left join med_home_page c
         on a.behospital_code = c.behospital_code and c.is_deleted = 'N'
         ) t