更新

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

@@ -415,7 +415,7 @@ public class ConsoleFacade {
             //手术完成人数为
             medQualityControlDTO.setOperationNum(Double.valueOf(operationFeeNum-operationCount));
             //手术完成率
-            medQualityControlDTO.setOperationStr(getResult(operationFeeNum-operationCount,startCount));
+            medQualityControlDTO.setOperationStr(getResult(operationFeeNum-operationCount,operationFeeNum));
             //入院记录24小时完成率
             //入院记录完成人数为
             medQualityControlDTO.setAdmissionNum(Double.valueOf(startCount-InHospitalRecords));
@@ -552,8 +552,6 @@ public class ConsoleFacade {
             }
         }
         return operationNum;
-
-
     }
     /**
      * 获取CT/MRI人数
@@ -563,14 +561,16 @@ public class ConsoleFacade {
         HashMap<String, Long> map = new HashMap<>();
         ArrayList<String> codeList = new ArrayList<>();
         for (Map<String, String> ctNumMap : getDoctorAdviceNum) {
-            String behospitalCode = ctNumMap.get("behospital_code");
-            if (!codeList.contains(behospitalCode)) {
-                String daItemName = ctNumMap.get("da_item_name");
-                if (daItemName.contains("CT") || daItemName.contains("X线")) {
-                    if ((!daItemName.contains("ATCH") && !daItemName.contains("TCT") && !daItemName.contains("HCT") && !daItemName.contains("OCT") && !daItemName.contains("NCT")&& !daItemName.contains("LCT")&& !daItemName.contains("ACT"))||(daItemName.contains("停"))) {
-                        //都不包含为CT
-                        codeList.add(behospitalCode);
-                        continue;
+            if (ctNumMap.get("doctor_advice_type").contains(QualityContent.STAT_ORDER)) {
+                String behospitalCode = ctNumMap.get("behospital_code");
+                if (!codeList.contains(behospitalCode)) {
+                    String daItemName = ctNumMap.get("da_item_name");
+                    if (daItemName.contains("CT") || daItemName.contains("X线")) {
+                        if ((!daItemName.contains("ATCH") && !daItemName.contains("TCT") && !daItemName.contains("HCT") && !daItemName.contains("OCT") && !daItemName.contains("NCT") && !daItemName.contains("LCT") && !daItemName.contains("ACT")) || (daItemName.contains("停"))) {
+                            //都不包含为CT
+                            codeList.add(behospitalCode);
+                            continue;
+                        }
                     }
                 }
             }
@@ -578,14 +578,16 @@ public class ConsoleFacade {
         ArrayList<String> codeMri = new ArrayList<>();
         for (Map<String, String> MRINumMap : getDoctorAdviceNum) {
             String behospitalCodeMri = MRINumMap.get("behospital_code");
-            if(!codeList.contains(behospitalCodeMri)){
-                String daItemName = MRINumMap.get("da_item_name");
-                    if(daItemName.contains("磁共振")||daItemName.contains("MR")){
-                        if(!daItemName.contains("IMRT")&&!daItemName.contains("mrs评分")){
-                        codeMri.add(behospitalCodeMri);
-                        continue;
+            if (MRINumMap.get("doctor_advice_type").contains(QualityContent.STAT_ORDER)) {
+                if (!codeList.contains(behospitalCodeMri)) {
+                    String daItemName = MRINumMap.get("da_item_name");
+                    if (daItemName.contains("磁共振") || daItemName.contains("MR")) {
+                        if (!daItemName.contains("IMRT") && !daItemName.contains("mrs评分")) {
+                            codeMri.add(behospitalCodeMri);
+                            continue;
                         }
                     }
+                }
             }
         }
         map.put("CT",Long.valueOf(codeList.size()));

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -244,7 +244,6 @@
         med_doctor_advice b
         WHERE
         b.is_deleted = 'N'
-        AND b.doctor_advice_type = '临时医嘱'
         <![CDATA[ and  b.da_status <> '作废' ]]>
         AND a.behospital_code = b.behospital_code
         AND a.hospital_id = b.hospital_id