Bladeren bron

1.输血记录为白蛋白,不判断RH填写错误
输血记录中未记录是否有不良反应修改逻辑

hujing 5 jaren geleden
bovenliggende
commit
f2c3add4f3

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0308.java

@@ -40,7 +40,7 @@ public class CLI0308 extends QCCatalogue {
                     status.set("0");
                     continue;
                 }
-                if (infusion_process.matches(regex)) {
+                if (infusion_process.matches(regex) || infusion_process.contains("无")) {
                     status.set("0");
                 } else {
                     status.set("-1");

+ 26 - 21
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0190.java

@@ -21,28 +21,33 @@ import java.util.Map;
 @Component
 public class FIRP0190 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
-                && inputInfo.getClinicalBloodDocs().size() > 0) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            List<ClinicalBloodDoc> clinicalBloodDocList = inputInfo.getClinicalBloodDocs();
-            String rhFactor = firstpageStructureMap.get(Content.rhFactor);
-            if (CatalogueUtil.isEmpty(rhFactor)) {
-                return;
+        if (inputInfo.getFirstPageRecordDoc() == null || inputInfo.getFirstPageRecordDoc().getStructureMap() == null
+                || inputInfo.getClinicalBloodDocs().size() == 0) {
+            status.set("0");
+            return;
+        }
+        Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+        List<ClinicalBloodDoc> clinicalBloodDocList = inputInfo.getClinicalBloodDocs();
+        String rhFactor = firstpageStructureMap.get(Content.rhFactor);
+        if (CatalogueUtil.isEmpty(rhFactor)) {
+            status.set("0");
+            return;
+        }
+        for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocList) {
+            String bloodType = clinicalBloodDoc.getStructureMap().get("输注种类、血型、数量");
+            if (StringUtils.isEmpty(bloodType)) {
+                continue;
             }
-            status.set("-1");
-            for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocList) {
-                String bloodType = clinicalBloodDoc.getStructureMap().get("输注种类、血型、数量");
-                if (StringUtils.isEmpty(bloodType)) {
-                    continue;
-                }
-                bloodType = bloodType.toUpperCase();
-                String rh = Content.rhFactor.toUpperCase();
-                if (bloodType.contains(rh) &&
-                        bloodType.contains(CatalogueUtil.removeSpecialChar(rhFactor))) {
-                    status.set("0");
-                    return;
-                }
+            if (bloodType.contains("白蛋白")) {
+                status.set("0");
+                continue;
+            }
+            bloodType = bloodType.toUpperCase();
+            String rh = Content.rhFactor.toUpperCase();
+            if (!bloodType.contains(rh) ||
+                    !bloodType.contains(CatalogueUtil.removeSpecialChar(rhFactor))) {
+                status.set("-1");
+                return;
             }
         }
     }