Merge branch 'dev/20210326_2.0.2' into debug

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

@@ -419,6 +419,8 @@ public class ConsoleFacade {
         Long ct = triggeringRulesMap.get("CT");
         //MR
         Long mr = triggeringRulesMap.get("MR");
+        //细菌培养
+        Long bacterialCulture = 0L;
         //抗菌药物
         Long antibiosis = 0L;
         //恶性肿瘤化学治疗
@@ -510,6 +512,16 @@ public class ConsoleFacade {
                 hashMapArrayList.add(stringStringHashMap);
             }
         }
+        //细菌培养
+        if (indexName.equals(QualityContent.XJPY_JCJL_FHL)||indexName.equals(QualityContent.QB)) {
+            if (bacterialCultureNum != null && bacterialCulture != null) {
+                Map<String, String> stringStringHashMap = new LinkedHashMap<>();
+                stringStringHashMap.put("name", QualityContent.XJPY_JCJL_FHL);
+                stringStringHashMap.put("notCopiedStr", getResult(bacterialCultureNum - bacterialCulture, bacterialCultureNum));
+                stringStringHashMap.put("num", bacterialCultureNum.toString());
+                hashMapArrayList.add(stringStringHashMap);
+            }
+        }
         //抗菌
         if (indexName.equals(QualityContent.KJYW_SY_FHL)||indexName.equals(QualityContent.QB)) {
             if (antibiosisFeeNum != null && antibiosis != null) {
@@ -594,7 +606,6 @@ public class ConsoleFacade {
         return true;
     }
 
-
     /**
      * 病案指标数据保存
      *
@@ -604,7 +615,6 @@ public class ConsoleFacade {
     public void getMedicaIndicator(FilterVO filterVO){
         MedIndexResult medIndexResult = new MedIndexResult();
        List<Map<String, String>> selectOperationNumMap = behospitalInfoFacade.selectOperationNum(filterVO);
-        if(ListUtil.isNotEmpty(selectOperationNumMap)) {
             Set<String> outHospitalCode = new CopyOnWriteArraySet<>();
             Set<String> operationCode = new CopyOnWriteArraySet<>();
             Set<String> operationPathologyCode = new CopyOnWriteArraySet<>();
@@ -614,23 +624,25 @@ public class ConsoleFacade {
             filterVO.setFlagStr("2");
             List<MedManageParamsDTO> doctorAdviceMedManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
             Map<String, List<String>> adviceNum = getAdviceNum(filterVO, doctorAdviceMedManageParams);
-                for (Map<String, String> stringStringMap : selectOperationNumMap) {
-                    String behospitalCode = stringStringMap.get("behospitalCode");
-                    //出院code
-                    outHospitalCode.add(behospitalCode);
-                    if (Double.parseDouble(stringStringMap.get("operationFee"))>0){
-                        //手术code
-                        operationCode.add(behospitalCode);
-                    }
-                    if (Double.parseDouble(stringStringMap.get("operationFee"))>0 && Double.parseDouble(stringStringMap.get("pathologyFee"))>QualityContent.pathologyFee){
-                        //病理code
-                        operationPathologyCode.add(behospitalCode);
-                    }
-                    if (Double.parseDouble(stringStringMap.get("antibiosisFee"))>0){
-                        //抗菌code
-                        antibiosisCode.add(behospitalCode);
-                    }
+        if(ListUtil.isNotEmpty(selectOperationNumMap)) {
+            for (Map<String, String> stringStringMap : selectOperationNumMap) {
+                String behospitalCode = stringStringMap.get("behospitalCode");
+                //出院code
+                outHospitalCode.add(behospitalCode);
+                if (Double.parseDouble(stringStringMap.get("operationFee")) > 0) {
+                    //手术code
+                    operationCode.add(behospitalCode);
                 }
+                if (Double.parseDouble(stringStringMap.get("operationFee")) > 0 && Double.parseDouble(stringStringMap.get("pathologyFee")) > QualityContent.pathologyFee) {
+                    //病理code
+                    operationPathologyCode.add(behospitalCode);
+                }
+                if (Double.parseDouble(stringStringMap.get("antibiosisFee")) > 0) {
+                    //抗菌code
+                    antibiosisCode.add(behospitalCode);
+                }
+            }
+        }
                 if(ListUtil.isNotEmpty(adviceVerify)){
                     for (String code : adviceVerify) {
                         outHospitalCode.add(code);
@@ -736,18 +748,16 @@ public class ConsoleFacade {
             Set<String> bloodCode = new CopyOnWriteArraySet<>();
         //指标二十七
 
-        //指标十七 医师查房记录
+        //指标18 医师查房记录 查询直接返回 -code需要加载
 
-        //指标十八 抢救记录
+        //指标19 抢救记录
         rescueMethods(doctorAdviceMedManageParams,medIndexResult,rescueCode);
-        //指标十九 出院患者病历2日归档
+        //指标20 出院患者病历2日归档
         getfileSecAmounts(filterVO,medIndexResult);
-        //指标十四 手术记录
+        //指标15 手术记录
         medIndexResult.setOperationCompleteResult(Double.parseDouble(operationFeeNum+""));
-        //指标十六  临床用血相关记录符合率
-        filterVO.setFlagStr("1");
-        List<MedManageParamsDTO> medManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
-        bloodMethods(doctorAdviceMedManageParams, medManageParams,medIndexResult,bloodCode);
+        //指标17  临床用血相关记录符合率
+        bloodMethods(doctorAdviceMedManageParams, filterVO,medIndexResult,bloodCode);
         medIndexResult.setHospitalId(filterVO.getHospitalId());
         medIndexResult.setStartDate(filterVO.getStartDate());
         medIndexResult.setEndDate(filterVO.getEndDate());
@@ -854,9 +864,7 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            System.out.println(operationPathologyCode.size());
         }
-    }
     /**
      * 两数据相除得到百分比
      * @param i
@@ -2964,6 +2972,7 @@ public class ConsoleFacade {
 
     //指标十八 抢救记录
     private  List<Map<String, String>> rescueMethod( Map<String, Double> medManageParams, List<Map<String, String>> retList,Map<String, Long> triggeringRulesMap){
+        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
         //接受抢救的质控病历总数
         double count = medManageParams.get("rescue_result");
         String num = null;
@@ -2973,8 +2982,9 @@ public class ConsoleFacade {
             if(rescueDo<0d){
                 num = null;
             }
+            firMap.put("num",String.valueOf(count));
         };
-        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
+
         firMap.put("name","患者抢救记录及时完成率");
         firMap.put("notCopiedStr",StringUtils.isEmpty(num) ? "0.00%":(num+"%"));
         retList.add(firMap);
@@ -2983,6 +2993,7 @@ public class ConsoleFacade {
 
     //指标十七 医师查房记录
     private List<Map<String, String>> WardRoundMethod( List<Map<String, String>> retList, Map<String, Object> baseIndex, Map<String, Long> triggeringRulesMap){
+        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
         String num = null;
         if( triggeringRulesMap.containsKey("WardRoundNum") && baseIndex.containsKey("forWorkNum") && !baseIndex.get("forWorkNum").toString().equals("0")){
             double wardRoundDo = currencyCal(baseIndex.get("forWorkNum"), triggeringRulesMap.get("WardRoundNum"));
@@ -2990,8 +3001,8 @@ public class ConsoleFacade {
             if(wardRoundDo<0d){
                 num = null;
             }
+            firMap.put("num",baseIndex.get("forWorkNum").toString());
         };
-        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
         firMap.put("name","医师查房记录完成率");
         firMap.put("notCopiedStr",StringUtils.isEmpty(num) ? "0.00%":(num+"%"));
         retList.add(firMap);
@@ -3000,6 +3011,7 @@ public class ConsoleFacade {
 
     //指标十四 手术记录
     private  List<Map<String, String>> operationMethod(Map<String, Double> medManageParams, List<Map<String, String>>retList, Map<String, Long> triggeringRulesMap){
+        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
         String operationFeeNum = medManageParams.get("operationFeeNum")+"";
         String num = null;
         if( triggeringRulesMap.containsKey("operationRecordNum") && StringUtils.isNotEmpty(operationFeeNum) && ! operationFeeNum.equals("0")){
@@ -3008,17 +3020,18 @@ public class ConsoleFacade {
             if(operationRecordDo<0d){
                 num = null;
             }
+            firMap.put("num",operationFeeNum);
         };
-        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
         firMap.put("name","手术相关记录完成率");
         firMap.put("notCopiedStr",StringUtils.isEmpty(num) ? "0.00%":(num+"%"));
+
         retList.add(firMap);
         return retList;
     }
 
     //指标十六  临床用血相关记录符合率
     private  List<Map<String, String>> bloodMethod( List<Map<String, String>>retList,Map<String, Double> bloodRes,Map<String, Long> triggeringRulesMap){
-
+        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
         double count = bloodRes.get("blood_result");
         String num = null;
         if(StringUtils.isNotEmpty(String.valueOf(count)) &&  count != 0d){
@@ -3028,8 +3041,9 @@ public class ConsoleFacade {
             if(bloodDo<0d){
                 num = null;
             }
+            firMap.put("num",String.valueOf(count));
         }
-        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
+
         firMap.put("name","临床用血相关记录符合率");
         firMap.put("notCopiedStr",StringUtils.isEmpty(num) ? "0.00%":(num+"%"));
         retList.add(firMap);
@@ -3049,6 +3063,7 @@ public class ConsoleFacade {
 
     //指标十九 出院患者病历2日归档
     private List<Map<String, String>> getfileSecAmount(Map<String, Double> medManageParams, List<Map<String, String>>retList, Map<String, Object> baseIndex){
+        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
         DecimalFormat df = new DecimalFormat("#0.00");
         double count = medManageParams.get("sec_file_result");
         String num = null;
@@ -3056,8 +3071,9 @@ public class ConsoleFacade {
             double retNum =count* 100/Double.parseDouble(baseIndex.get("sevenWorkNum").toString());
             double firGradeStr = Double.parseDouble(df.format(retNum));
             num = String.valueOf(firGradeStr);
+            firMap.put("num",baseIndex.get("sevenWorkNum").toString());
         }
-        LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
+
         firMap.put("name","出院患者病历2日归档率");
         firMap.put("notCopiedStr",StringUtils.isEmpty(num) ? "0.00%":(num+"%"));
         retList.add(firMap);
@@ -3148,6 +3164,7 @@ public class ConsoleFacade {
         DecimalFormat df = new DecimalFormat("0.00");
         if(indexName.equals(QualityContent.JJBLL)||indexName.equals(QualityContent.QB)) {
             //指标二十七 -甲级病历率
+        LinkedHashMap<String, String> fouMap = new LinkedHashMap<>();
             Double firRecord = 0d;
             String num4= null;
             if(StringUtils.isNotEmpty( baseIndex.get("forWorkNum").toString())){
@@ -3157,8 +3174,8 @@ public class ConsoleFacade {
                 double retNum = Double.parseDouble(baseIndex.get("sixWorkNum").toString()) * 100 / firRecord;
                 double firGradeStr = Double.parseDouble(df.format(retNum));
                 num4 = String.valueOf(firGradeStr);
+                fouMap.put("num",String.valueOf(firRecord));
             }
-            LinkedHashMap<String, String> fouMap = new LinkedHashMap<>();
             fouMap.put("name","甲级病历率");
             fouMap.put("notCopiedStr",StringUtils.isEmpty(num4) ? "0.00%":(num4+"%"));
             retList.add(fouMap);
@@ -3170,7 +3187,7 @@ public class ConsoleFacade {
     /**
      * ==============================后台维护===============================
      */
-    //指标十八 抢救记录
+    //指标19 抢救记录
     private  void rescueMethods(List<MedManageParamsDTO> medManageParams,MedIndexResult medIndexResult, Set<String> rescueCode){
         List<MedManageParamsDTO> manageList= new ArrayList<>();
         List<String> rescueDrugList = QualityContent.RESCUEDRUGLIST;
@@ -3185,7 +3202,6 @@ public class ConsoleFacade {
                 }
             }
         }
-
         //接受抢救的质控病历总数
         double count = manageList.stream().map(MedManageParamsDTO::getBehospitalCode).distinct().count();
         if(StringUtils.isNotEmpty(String.valueOf(count)) &&  count != 0d){
@@ -3193,8 +3209,10 @@ public class ConsoleFacade {
         }
     }
 
-    //指标十六  临床用血相关记录符合率
-    private void bloodMethods(List<MedManageParamsDTO> doctorAdviceList, List<MedManageParamsDTO> medManageParams,MedIndexResult medIndexResult, Set<String> bloodCode){
+    //指标17  临床用血相关记录符合率
+    private void bloodMethods(List<MedManageParamsDTO> doctorAdviceList,FilterVO filterVO,MedIndexResult medIndexResult, Set<String> bloodCode){
+        filterVO.setFlagStr("1");
+        List<MedManageParamsDTO> medManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
         Set<String> manageList= new CopyOnWriteArraySet<>();
         List<String> blood_list = QualityContent.BLOODLIST;
         //lis项目存在用血住院病历号
@@ -3226,7 +3244,7 @@ public class ConsoleFacade {
     }
 
 
-    //指标十九 出院患者病历2日归档
+    //指标20 出院患者病历2日归档
     private void getfileSecAmounts(FilterVO filterVO,MedIndexResult medIndexResult){
         QueryWrapper<BehospitalInfo> query = new QueryWrapper<>();
         DecimalFormat df = new DecimalFormat("#0.00");

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -724,7 +724,7 @@
         f3.sixWorkNum,
         f4.sevenWorkNum
         from (
-        SELECT  count(*)  as firWorkNum
+        SELECT count(DISTINCT a.behospital_code)  as firWorkNum
         FROM
         med_behospital_info a
         WHERE
@@ -740,7 +740,7 @@
         <if test="endDate != null and endDate != ''">
             <![CDATA[ AND a.leave_hospital_date <= #{lastEndDate}]]>
         </if>)f1,
-            ( SELECT count(*) AS secWorkNum
+            ( SELECT count(DISTINCT a.behospital_code) AS secWorkNum
         FROM
         med_outpatient_info a
         WHERE
@@ -755,10 +755,10 @@
             AND a.hospital_id = #{hospitalId}
         </if>)f2,(
            select
-        count(case when  <![CDATA[m.behospital_date >= #{startDate}]]>  and  <![CDATA[m.behospital_date <= #{endDate}]]>
+        count(DISTINCT case when  <![CDATA[m.behospital_date >= #{startDate}]]>  and  <![CDATA[m.behospital_date <= #{endDate}]]>
         and m.is_placefile = 0 then m.behospital_code else null end) as thrWorkNum,
-        count(case when  <![CDATA[m.leave_hospital_date >= #{startDate}]]>  and  <![CDATA[m.leave_hospital_date <= #{endDate}]]>  and m.is_placefile = 1 then m.behospital_code else null end) as forWorkNum,
-        count(case when  <![CDATA[m.leave_hospital_date >= #{startDate}]]> and <![CDATA[m.leave_hospital_date <= #{endDate}]]> and m.is_placefile = 1 and m.level = '甲' then m.behospital_code else null end) as sixWorkNum
+        count(DISTINCT case when  <![CDATA[m.leave_hospital_date >= #{startDate}]]>  and  <![CDATA[m.leave_hospital_date <= #{endDate}]]>  and m.is_placefile = 1 then m.behospital_code else null end) as forWorkNum,
+        count(DISTINCT case when  <![CDATA[m.leave_hospital_date >= #{startDate}]]> and <![CDATA[m.leave_hospital_date <= #{endDate}]]> and m.is_placefile = 1 and m.level = '甲' then m.behospital_code else null end) as sixWorkNum
            from(
            SELECT DISTINCT a.*,b.level
             FROM
@@ -774,7 +774,7 @@
             AND a.hospital_id = #{hospitalId}
         </if>)m
             )f3,(
-        SELECT  count(*)  as sevenWorkNum
+        SELECT count(DISTINCT a.behospital_code)  as sevenWorkNum
         FROM
         med_behospital_info a
         WHERE

src/main/resources/mapper/MedIndexResultMapper.xml

@@ -51,8 +51,8 @@
             COALESCE (sum(a.implants_result), 0) AS 'implants_result',
             COALESCE (sum(a.blood_result), 0) AS 'blood_result',
             COALESCE (sum(a.rescue_result), 0) AS 'rescue_result',
-            COALESCE (sum(a.sec_file_result), 0) AS 'sec_file_result',
-            COALESCE (sum(a.fir_record_result), 0) AS 'fir_record_result'
+            COALESCE (sum(a.sec_file_result), 0) AS 'sec_file_result'
+
         FROM
             med_index_result a
         WHERE