Browse Source

1.修改bug

hujing 5 năm trước cách đây
mục cha
commit
5ba1484712

+ 10 - 6
kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0569.java

@@ -23,33 +23,37 @@ import java.util.regex.Pattern;
 @Component
 public class CLI0569 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();
         if (ListUtil.isEmpty(clinicalBloodDocs)) {
-            status.set("0");
             return;
         }
         if (clinicalBloodDocs != null && clinicalBloodDocs.size() > 0) {
+            int matchSum = 0;
             for (ClinicalBloodDoc cliB : clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
                 //台州
                 if (StringUtils.isNotEmpty(cliBStructureMap.get("血型"))) {
-                    status.set("0");
-                    break;
+                    matchSum++;
+                    continue;
                 }
                 if (cliBStructureMap.containsKey("输注种类、血型、数量")) {
                     String bloodType = cliBStructureMap.get("输注种类、血型、数量");
                     if (StringUtils.isNotEmpty(bloodType) &&
                             (bloodType.contains("白蛋白") || bloodType.contains("凝血酶原复合物"))) {
+                        matchSum++;
                         continue;
                     }
                     Pattern compile = Pattern.compile("[a-zA-Z]+型");
                     Matcher matcher = compile.matcher(StringUtil.removeBlank(cliBStructureMap.get("输注种类、血型、数量")));
-                    if (!matcher.find()) {
-                        status.set("-1");
-                        return;
+                    if (matcher.find()) {
+                        matchSum++;
                     }
                 }
             }
+            if (matchSum != clinicalBloodDocs.size()) {
+                status.set("0");
+            }
         }
 
     }

+ 4 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0195.java

@@ -6,13 +6,9 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
-import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
-import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
-import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,10 +21,10 @@ import java.util.Map;
 public class FIRP0195 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
+        /*FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();*/
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
         DeathCaseDiscussDoc deathCaseDiscussDoc = inputInfo.getDeathCaseDiscussDoc();
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
+        /* List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();*/
         if (inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
@@ -42,10 +38,10 @@ public class FIRP0195 extends QCCatalogue {
             wardOutWay = "死亡";
             if (!match(outWay, wardOutWay)) {
                 status.set("-1");
-                return;
             }
         }
 
+        /*
         if (threeLevelWardDocs.size() > 0) {
             List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
             ThreeLevelWardDoc lastWardDoc = allDoctorWradDocs.get(allDoctorWradDocs.size() - 1);
@@ -62,6 +58,7 @@ public class FIRP0195 extends QCCatalogue {
                 }
             }
         }
+         */
 
 
     }

+ 2 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0252.java

@@ -29,5 +29,7 @@ public class FIRP0252 extends QCCatalogue {
                 status.set("0");
             }
         }
+        /* 这条规则暂时无法做,默认不报错 */
+        status.set("0");
     }
 }

+ 3 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0261.java

@@ -19,11 +19,14 @@ import java.util.Map;
 public class FIRP0261 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
+        /*
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.ob_oa))){
                 status.set("-1");
             }
         }
+        暂时判断不了这条规则,默认不报错
+         */
     }
 }

+ 3 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0263.java

@@ -19,11 +19,14 @@ import java.util.Map;
 public class FIRP0263 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
+        /*
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.clinical_pathology))){
                 status.set("-1");
             }
         }
+        暂时判断不了这条规则,默认不报错
+         */
     }
 }

+ 3 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0265.java

@@ -19,11 +19,14 @@ import java.util.Map;
 public class FIRP0265 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
+        /*
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.radiation_pathology))){
                 status.set("-1");
             }
         }
+        暂时判断不了这条规则,默认不报错
+         */
     }
 }

+ 3 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0147.java

@@ -46,6 +46,9 @@ public class LEA0147 extends QCCatalogue {
                 if (ListUtil.isNotEmpty(diags) && hospitalDiagMap != null) {
                     List<String> diagnames = new ArrayList<>();
                     for (Diag dg:diags) {
+                        if ("其他的".equals(dg.getHospitalDiagName())){
+                            continue;
+                        }
                         if (hospitalDiagMap.get(dg.getHospitalDiagName())==null) {
                             diagnames.add(dg.getHospitalDiagName());
                         }