Merge remote-tracking branch 'origin/dev-shaoyf' into dev-shaoyf

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

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.model.entity.General;
 import com.lantone.qc.pub.model.entity.GeneralDesc;
 import com.lantone.qc.pub.model.label.PresentLabel;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -32,11 +33,9 @@ public class BEH0441 extends QCCatalogue {
             return;
         }
         List<String> words = Lists.newArrayList("胃纳", "食纳", "食欲", "未纳", "纳眠", "饮食", "睡眠"
-                ,"禁食","未食","鼻饲","食","吃","饮");
-        /*
+                , "禁食", "未食", "鼻饲", "饮");
         String presentText = presentLabel.getText();
         if (StringUtil.isNotBlank(presentText)) {
-
             for (String word : words) {
                 if (presentText.contains(word)) {
                     status.set("0");
@@ -44,7 +43,6 @@ public class BEH0441 extends QCCatalogue {
                 }
             }
         }
-         */
         List<GeneralDesc> generals = presentLabel.getGenerals();
         List<General> gens = presentLabel.getGens();
 

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

@@ -32,7 +32,6 @@ public class BEH0444 extends QCCatalogue {
         PresentLabel presentLabel = beHospitalizedDoc.getPresentLabel();
         if (presentLabel != null) {
             List<String> words = Lists.newArrayList("神志", "神清", "神不清", "意识清", "意识不清", "昏迷","精神","意识");
-            /*
             String presentLabelText = presentLabel.getText();
             if (StringUtil.isNotBlank(presentLabelText)) {
                 for (String word : words) {
@@ -42,8 +41,6 @@ public class BEH0444 extends QCCatalogue {
                     }
                 }
             }
-
-             */
             List<GeneralDesc> generals = presentLabel.getGenerals();
             List<General> gens = presentLabel.getGens();
             if (ListUtil.isEmpty(generals) && ListUtil.isEmpty(gens)) {

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

@@ -38,7 +38,7 @@ public class FIRP02992 extends QCCatalogue {
             beDrugAllergy = RegularUtil.ClearBracket(beDrugAllergy); // 括号内容不匹配
 
             // “未发现” == “否认”
-            if ("未发现".equals(fpAllergyDrug) && "否认".equals("beDrugAllergy")) {
+            if ("未发现".equals(beDrugAllergy) || StringUtil.isBlank(fpAllergyDrug) || "否认".equals(beDrugAllergy)) {
                 return ;
             }
             if (!fpAllergyDrug.equals(beDrugAllergy)) {

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

@@ -43,9 +43,9 @@ public class LEA0146 extends QCCatalogue {
 
             BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
             List<String> beHospitalDiag = new ArrayList<>();//收集入院记录中初步诊断、修正诊断、其他诊断所有诊断
-            if (beHospitalizedDoc.getInitialDiagLabel() != null) {
-                putDiagToList(beHospitalizedDoc.getInitialDiagLabel().getDiags(), beHospitalDiag); //初步诊断
-            }
+//            if (beHospitalizedDoc.getInitialDiagLabel() != null) {
+//                putDiagToList(beHospitalizedDoc.getInitialDiagLabel().getDiags(), beHospitalDiag); //初步诊断
+//            }
             if (beHospitalizedDoc.getRevisedDiagLabel() != null) {
                 putDiagToList(beHospitalizedDoc.getRevisedDiagLabel().getDiags(), beHospitalDiag); //修正诊断
             }