Browse Source

规则更新

rengb 5 years ago
parent
commit
722d61001d

+ 3 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0036.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
- * @Description:
+ * @Description: 手术史描述不完整
  * @author: rengb
  * @author: rengb
  * @time: 2020/3/10 14:02
  * @time: 2020/3/10 14:02
  */
  */
@@ -29,7 +29,8 @@ public class BEH0036 extends QCCatalogue {
             if (operation == null || StringUtil.isBlank(operation.getName())) {
             if (operation == null || StringUtil.isBlank(operation.getName())) {
                 continue;
                 continue;
             }
             }
-            if ((operation.getPd() == null || StringUtil.isBlank(operation.getPd().getName()))
+            if ((operation.getNegative() == null || StringUtil.isBlank(operation.getNegative().getName()))
+                    && (operation.getPd() == null || StringUtil.isBlank(operation.getPd().getName()))
                     && (operation.getOperationResult() == null || StringUtil.isBlank(operation.getOperationResult().getName()))
                     && (operation.getOperationResult() == null || StringUtil.isBlank(operation.getOperationResult().getName()))
                     && (operation.getDiag() == null || StringUtil.isBlank(operation.getDiag().getName()))) {
                     && (operation.getDiag() == null || StringUtil.isBlank(operation.getDiag().getName()))) {
                 info += operation.getName() + " ";
                 info += operation.getName() + " ";

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

@@ -29,7 +29,8 @@ public class BEH0037 extends QCCatalogue {
             if (wound == null || StringUtil.isBlank(wound.getName())) {
             if (wound == null || StringUtil.isBlank(wound.getName())) {
                 continue;
                 continue;
             }
             }
-            if ((wound.getPd() == null || StringUtil.isBlank(wound.getPd().getName()))
+            if ((wound.getNegative() == null || StringUtil.isBlank(wound.getNegative().getName()))
+                    && (wound.getPd() == null || StringUtil.isBlank(wound.getPd().getName()))
                     && (wound.getBodyPart() == null || StringUtil.isBlank(wound.getBodyPart().getName()))
                     && (wound.getBodyPart() == null || StringUtil.isBlank(wound.getBodyPart().getName()))
                     && (wound.getDegree() == null || StringUtil.isBlank(wound.getDegree().getName()))
                     && (wound.getDegree() == null || StringUtil.isBlank(wound.getDegree().getName()))
                     && (wound.getTreat() == null || StringUtil.isBlank(wound.getTreat().getName()))
                     && (wound.getTreat() == null || StringUtil.isBlank(wound.getTreat().getName()))

+ 26 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0038.java

@@ -3,10 +3,15 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.entity.BloodTransfusion;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
+import java.util.List;
+
 /**
 /**
- * @Description:
+ * @Description: 输血史描述不完整
  * @author: rengb
  * @author: rengb
  * @time: 2020/3/10 14:02
  * @time: 2020/3/10 14:02
  */
  */
@@ -15,6 +20,24 @@ public class BEH0038 extends QCCatalogue {
 
 
     @Override
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        status = "0";
+        List<BloodTransfusion> bloodTransfusions = inputInfo.getBeHospitalizedDoc().getPastLabel().getBloodTransfusions();
+        if (ListUtil.isEmpty(bloodTransfusions)) {
+            return;
+        }
+        for (BloodTransfusion bloodTransfusion : bloodTransfusions) {
+            if (bloodTransfusion == null || StringUtil.isBlank(bloodTransfusion.getName())) {
+                continue;
+            }
+            if ((bloodTransfusion.getNegative() == null || StringUtil.isBlank(bloodTransfusion.getNegative().getName()))
+                    && (bloodTransfusion.getPd() == null || StringUtil.isBlank(bloodTransfusion.getPd().getName()))
+                    && (bloodTransfusion.getQuantity() == null || StringUtil.isBlank(bloodTransfusion.getQuantity().getName()))) {
+                info += bloodTransfusion.getName() + " ";
+            }
+        }
+        if (StringUtil.isNotBlank(info)) {
+            status = "-1";
+        }
     }
     }
-}
+
+}

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

@@ -29,7 +29,8 @@ public class BEH0039 extends QCCatalogue {
             if (allergyFood == null || StringUtil.isBlank(allergyFood.getName())) {
             if (allergyFood == null || StringUtil.isBlank(allergyFood.getName())) {
                 continue;
                 continue;
             }
             }
-            if ((allergyFood.getPd() == null || StringUtil.isBlank(allergyFood.getPd().getName()))
+            if ((allergyFood.getNegative() == null || StringUtil.isBlank(allergyFood.getNegative().getName()))
+                    && (allergyFood.getPd() == null || StringUtil.isBlank(allergyFood.getPd().getName()))
                     && (allergyFood.getDegree() == null || StringUtil.isBlank(allergyFood.getDegree().getName()))) {
                     && (allergyFood.getDegree() == null || StringUtil.isBlank(allergyFood.getDegree().getName()))) {
                 info += allergyFood.getName() + " ";
                 info += allergyFood.getName() + " ";
             }
             }

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

@@ -29,7 +29,8 @@ public class BEH0040 extends QCCatalogue {
             if (allergyMedicine == null || StringUtil.isBlank(allergyMedicine.getName())) {
             if (allergyMedicine == null || StringUtil.isBlank(allergyMedicine.getName())) {
                 continue;
                 continue;
             }
             }
-            if ((allergyMedicine.getPd() == null || StringUtil.isBlank(allergyMedicine.getPd().getName()))
+            if ((allergyMedicine.getNegative() == null || StringUtil.isBlank(allergyMedicine.getNegative().getName()))
+                    && (allergyMedicine.getPd() == null || StringUtil.isBlank(allergyMedicine.getPd().getName()))
                     && (allergyMedicine.getDegree() == null || StringUtil.isBlank(allergyMedicine.getDegree().getName()))) {
                     && (allergyMedicine.getDegree() == null || StringUtil.isBlank(allergyMedicine.getDegree().getName()))) {
                 info += allergyMedicine.getName() + " ";
                 info += allergyMedicine.getName() + " ";
             }
             }