体重/二便描述(现病史)更新

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

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.entity.GeneralDesc;
 import org.springframework.stereotype.Component;
 
@@ -18,16 +19,27 @@ import java.util.List;
 @Component
 public class BEH0442 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-
-        List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
+        status.set("0");
+        BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
+        if(beHospitalizedDoc != null && beHospitalizedDoc.getPresentLabel() != null){
+            String text = beHospitalizedDoc.getPresentLabel().getText();
+            if(text != null && (text.contains("二便")|| text.contains("小便")
+                    ||text.contains("大便")||text.contains("大小便"))){
+                return;
+            }else {
+                status.set("-1");
+            }
+        }
+        /*List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
         if(generals.size() > 0 || generals != null){
             for (GeneralDesc general:generals) {
-                if(general.getName().contains("二便") || general.getName().contains("小便")||general.getName().contains("大便")){
+                if(general.getName().contains("二便") || general.getName().contains("小便")
+                        ||general.getName().contains("大便")||general.getName().contains("大小便")){
                     status.set("0");
                     break;
                 }
             }
-        }
+        }*/
 
     }
 }

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

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.entity.GeneralDesc;
 import org.springframework.stereotype.Component;
 
@@ -18,14 +19,14 @@ import java.util.List;
 @Component
 public class BEH0443 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-
-        List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
-        if(generals.size() > 0 || generals != null){
-            for (GeneralDesc general:generals) {
-                if(general.getName().contains("体重")){
-                    status.set("0");
-                    break;
-                }
+        status.set("0");
+        BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
+        if(beHospitalizedDoc != null && beHospitalizedDoc.getPresentLabel() != null){
+            String text = beHospitalizedDoc.getPresentLabel().getText();
+            if(text != null && text.contains("体重")){
+                return;
+            }else {
+                status.set("-1");
             }
         }