将获取出院患者总数转移到病案指标数据保存方法中

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

@@ -405,9 +405,6 @@ public class ConsoleFacade {
         filterFacade.filterSet(filterVO);
         List<Map<String, String>> hashMapArrayList = new ArrayList<>();
         String indexName = filterVO.getIndexName();
-        Map<String, Long> selectOperationNumMap = behospitalInfoFacade.selectOperationNum(filterVO);
-        //出院人数
-        Long startCount = selectOperationNumMap.get(QualityContent.DISCHARGED_PATIENTS);
         //各指标未完成人数情况 ---分子
         Map<String, Long> triggeringRulesMap = behospitalInfoFacade.triggeringRules(filterVO);
         Long operationCount = triggeringRulesMap.get(QualityContent.SSJLWCC_24H);
@@ -425,6 +422,7 @@ public class ConsoleFacade {
         //恶性肿瘤化学治疗
         Long chemotherapyMalignantTumors = 0L;
         Map<String, Double> medicalRecordIndicator = medIndexResultFacade.medicalRecordIndicator(filterVO);
+        Double startCount = medicalRecordIndicator.get("startCount");
         Double operationFeeNum = medicalRecordIndicator.get("operationFeeNum");
         Double CTNum = medicalRecordIndicator.get("CTNum");
         Double MRNum = medicalRecordIndicator.get("MRNum");
@@ -553,6 +551,7 @@ public class ConsoleFacade {
         MedIndexResult medIndexResult = new MedIndexResult();
         Map<String, Long> selectOperationNumMap = behospitalInfoFacade.selectOperationNum(filterVO);
         //出院人数
+        Long startCount = selectOperationNumMap.get(QualityContent.DISCHARGED_PATIENTS);
             Long operationFeeNum = 0L;
             List<MedManageParamsDTO> doctorAdviceMedManageParams  = new ArrayList<>();
                 filterVO.setFlagStr("2");
@@ -576,7 +575,10 @@ public class ConsoleFacade {
                 antibiosisFeeNum = antibiosisFeeNum + antibiosisNum;
                 //恶性肿瘤化学治疗人数
                 Long chemotherapyMalignantTumorsNum = adviceNum.get("chemotherapyMalignantTumors");
-                //手术记录完成率
+                //出院人数
+                    if(startCount!=null){
+                        medIndexResult.setAdmissionResult(Double.valueOf(startCount));
+                    }
                 //手术完成人数为
                     if (operationFeeNum != null) {
                         medIndexResult.setOperationResult(Double.valueOf(operationFeeNum));
@@ -808,7 +810,6 @@ public class ConsoleFacade {
                                         }
                                     }
                                 }
-
                             }
                         }
                         //获取为长期医嘱或临时医嘱的医嘱

src/main/resources/mapper/MedIndexResultMapper.xml

@@ -41,6 +41,7 @@ wardRoundResult" />
 
     <select id="medicalRecordIndicator" parameterType="com.diagbot.vo.FilterVO" resultType="java.util.Map">
          SELECT
+            COALESCE (sum(a.admission_result), 0) AS 'startCount',
             COALESCE (sum(a.operation_result), 0) AS 'operationFeeNum',
             COALESCE (sum(a.ct_result), 0) AS 'CTNum',
             COALESCE (sum(a.mri_result), 0) AS 'MRNum',