bug修正

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0012.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -23,6 +24,7 @@ import java.util.Map;
  */
 @Component
 public class BEH0012 extends QCCatalogue {
+    private static String[] strings = {"2型糖尿病"};
     @Autowired
     private RedisUtil redisUtil;
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
@@ -35,7 +37,11 @@ public class BEH0012 extends QCCatalogue {
         List<Diag> diags = inputInfo.getBeHospitalizedDoc().getInitialDiagLabel().getDiags();
         if(diags != null && diags.size()>0){
             for (Diag diag:diags) {
+                List<String> disList = Arrays.asList(strings);
                 String hospitalDiagName = diag.getHospitalDiagName().trim().replace("待查","");
+                if(!disList.contains(hospitalDiagName)){
+                    hospitalDiagName = hospitalDiagName.replaceAll("^[0-9]","");
+                }
                 if(!hostpital_standDiag.containsKey(hospitalDiagName)){
                     diags_out.add(hospitalDiagName);
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0305.java

@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
 public class CLI0305 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
+        Boolean flag = false;
         List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();
         if (clinicalBloodDocs != null && clinicalBloodDocs.size() > 0) {
             for (ClinicalBloodDoc cliB : clinicalBloodDocs) {
@@ -43,13 +44,15 @@ public class CLI0305 extends QCCatalogue {
                             continue;
                         }
                         if (CatalogueUtil.compareTime(infusionEndDate, recordDate, 24 * 60L)) {
-                            status.set("-1");
+                            flag = true;
                             info.set(infusionEnd + " -> " + recordDateStr);
-                            return;
                         }
                     }
                 }
             }
         }
+        if(flag){
+            status.set("-1");
+        }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0175.java

@@ -9,6 +9,7 @@ import com.lantone.qc.pub.model.entity.Diag;
 import com.lantone.qc.pub.util.ListUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -20,6 +21,7 @@ import java.util.Map;
  */
 @Component
 public class FIRP0175 extends QCCatalogue {
+    private static String[] strings = {"2型糖尿病"};
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
@@ -34,6 +36,10 @@ public class FIRP0175 extends QCCatalogue {
             }
             String firstpageleaveDiag = dischargeDiag.get(0).get(Content.diagnoseName);
             String leaveDiag = leaveDiags.get(0).getHospitalDiagName();
+            //判断是否有2型糖尿病这种病如果没有，把疾病前的数字去掉
+            if(!Arrays.asList(strings).contains(leaveDiag)){
+                leaveDiag = leaveDiag.replaceAll("^[0-9]","");
+            }
             if (!CatalogueUtil.compareToken(firstpageleaveDiag, leaveDiag)) {
                 status.set("-1");
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0181.java

@@ -25,7 +25,9 @@ public class FIRP0181 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String transferDept = firstpageStructureMap.get(Content.dp_out);
-            if (!CatalogueUtil.isEmpty(transferDept) && !"[]".equals(transferDept)){
+            String transferDept_changxing = firstpageStructureMap.get("损伤中毒因素");
+            if ((!CatalogueUtil.isEmpty(transferDept) && !"[]".equals(transferDept))
+                    || (!CatalogueUtil.isEmpty(transferDept_changxing) && !"[]".equals(transferDept_changxing))){
                 status.set("0");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0149.java

@@ -36,7 +36,7 @@ public class LEA0149 extends QCCatalogue {
                 Map<String, String> lhStructureMap = leaveHospitalDoc.getStructureMap();
                 ChiefLabel chiefLabel = beHospitalizedDoc.getChiefLabel();
                 if (lhStructureMap != null && chiefLabel != null) {
-                    String bhChief = chiefLabel.getText();
+                    String bhChief = chiefLabel.getText().replaceAll("[\\p{Punct}\\pP。-]", "");
                     String leaveChief = lhStructureMap.get("主诉");
                     String bhThings = lhStructureMap.get("入院情况");
                     if (StringUtil.isNotBlank(bhThings)){
@@ -45,7 +45,6 @@ public class LEA0149 extends QCCatalogue {
 
                     //如果出院小结结构化数据能取出主诉，则直接用该主诉和入院记录主诉比较
                     if (StringUtil.isNotBlank(leaveChief)) {
-                        /*leaveChief = leaveChief.replaceAll("[\\p{Punct}\\pP。]", "");*/
                         leaveChief = leaveChief.replaceAll("[\\p{Punct}\\pP。-]", "");
                         if (bhChief.equals(leaveChief)) {
                             status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0156.java

@@ -5,6 +5,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
+import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -29,6 +30,9 @@ public class LEA0156 extends QCCatalogue {
         if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
             Map<String, String> structureMap = leaveHospitalDoc.getStructureMap();
             if (structureMap != null) {
+                if(StringUtil.isNotBlank(structureMap.get("出院注意事项"))){
+                    return;
+                }
                 if (StringUtils.isBlank(structureMap.get("健康教育")) && StringUtils.isBlank(structureMap.get("出院医嘱"))) {
                     status.set("-1");
                 }