Browse Source

初步诊断不完整规则调整

zhangzw 4 years ago
parent
commit
d238534291

+ 6 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import java.util.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * @ClassName : BEH0011
  * @ClassName : BEH0011
@@ -44,6 +45,8 @@ public class BEH0011 extends QCCatalogue {
         }
         }
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
         DiagLabel initialDiagLabel = inputInfo.getBeHospitalizedDoc().getInitialDiagLabel();
         DiagLabel initialDiagLabel = inputInfo.getBeHospitalizedDoc().getInitialDiagLabel();
+        /*补充诊断*/
+        DiagLabel suppleDiagLabel = inputInfo.getBeHospitalizedDoc().getSuppleDiagLabel();
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         if (initialDiagLabel == null) {
         if (initialDiagLabel == null) {
             status.set("0");
             status.set("0");
@@ -105,6 +108,9 @@ public class BEH0011 extends QCCatalogue {
         List<String> initDiags = new ArrayList<>();
         List<String> initDiags = new ArrayList<>();
         List<Diag> initialDiagDiags = initialDiagLabel.getDiags();
         List<Diag> initialDiagDiags = initialDiagLabel.getDiags();
         addInitDiagHospitalName(initDiags, initialDiagDiags);
         addInitDiagHospitalName(initDiags, initialDiagDiags);
+        List<Diag> suppleDiagDiags = suppleDiagLabel.getDiags();
+        addInitDiagHospitalName(initDiags, suppleDiagDiags);
+        initDiags = initDiags.stream().distinct().collect(Collectors.toList());
 
 
         String infoStr = "";
         String infoStr = "";
         int matchSum = 0;
         int matchSum = 0;

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0070.java

@@ -32,7 +32,7 @@ public class BEH0070 extends QCCatalogue {
         String familyText = structureMap.get("家族史");
         String familyText = structureMap.get("家族史");
         if (StringUtil.isNotBlank(familyText)) {
         if (StringUtil.isNotBlank(familyText)) {
             familyText = StringUtil.removeBlank(familyText);
             familyText = StringUtil.removeBlank(familyText);
-            if (familyText.contains("家族遗传病") || familyText.contains("结核")) {
+            if (familyText.contains("家族遗传病") || familyText.contains("结核") || familyText.contains("遗传病")) {
                 status.set("0");
                 status.set("0");
                 return;
                 return;
             }
             }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0411.java

@@ -24,7 +24,7 @@ public class BEH0411 extends QCCatalogue {
         }
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
         if(structureMap != null){
-            String name = structureMap.get("记录日期");
+            String name = structureMap.get("记录时间");
             if(CatalogueUtil.isEmpty(name)){
             if(CatalogueUtil.isEmpty(name)){
                 status.set("-1");
                 status.set("-1");
             }
             }