Browse Source

义乌妇幼保:bug修改

wangsy 4 years ago
parent
commit
b929b0df6a

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

@@ -37,7 +37,7 @@ public class BEH0048 extends QCCatalogue {
             return;
         }
         String personalText = personalLabel.getText();
-        if (personalText.contains("详见原病历") || personalText.contains("放射") || personalText.contains("粉尘")) {
+        if (personalText.contains("详见原病历") || personalText.contains("放射") || personalText.contains("粉尘") || personalText.contains("毒物")) {
             status.set("0");
             return;
         }

+ 10 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH02966.java

@@ -5,6 +5,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -26,6 +27,15 @@ public class BEH02966 extends QCCatalogue {
             return;
         }
 
+        MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
+        if (medicalRecordInfoDoc != null && medicalRecordInfoDoc.getStructureMap() != null) {
+            //科室
+            String behDeptName = medicalRecordInfoDoc.getStructureMap().get("behDeptName");
+            if (StringUtil.isNotBlank(behDeptName) && (behDeptName.contains("新生儿科") || behDeptName.contains("产科"))) {
+                return;
+            }
+        }
+
         Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         String gender = beHospitalStructureMap.get("性别");
         if (StringUtil.isBlank(gender)) {

+ 14 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/firstpagerecord/FIRP0190.java

@@ -33,7 +33,7 @@ public class FIRP0190 extends QCCatalogue {
         if (CatalogueUtil.isEmpty(rhFactor)) {
             return;
         }
-        rhFactor = "RH" + rhFactor;
+//        rhFactor = "RH" + rhFactor;
         int matchSum = 0, noRhSum = 0;
         for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocList) {
             String bloodType = clinicalBloodDoc.getStructureMap().get("病情记录");
@@ -47,13 +47,23 @@ public class FIRP0190 extends QCCatalogue {
             if (!bloodType.contains("阴") && !bloodType.contains("阳")) {
                 noRhSum++;
             }
+
+
             bloodType = bloodType.toUpperCase();
-            if (bloodType.contains(rhFactor)) {
-                matchSum++;
+            if (bloodType.contains("RH")) {
+                if (rhFactor.contains("阴") && bloodType.contains("-")) {
+                    matchSum++;
+                }
+                if (rhFactor.contains("阳") && bloodType.contains("+")) {
+                    matchSum++;
+                }
+                if (bloodType.contains(rhFactor)) {
+                    matchSum++;
+                }
             }
         }
         /* 如果所有输血记录都没有rh记录(阴、阳),则不报错 */
-        if (noRhSum == clinicalBloodDocList.size()){
+        if (noRhSum == clinicalBloodDocList.size()) {
             return;
         }
         if (matchSum == 0) {

+ 0 - 6
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/leavehospital/LEA02987.java

@@ -71,12 +71,6 @@ public class LEA02987 extends QCCatalogue {
             String type = adviceDocStructureMap.get("医嘱类型判别");
             if (StringUtil.isNotBlank(type) && type.equals("出院带药")) {
                 if (StringUtil.isNotBlank(name)) {
-                    if (name.contains("(基)")) {
-                        name = name.substring(0, name.indexOf("(基)"));
-                    }
-                    if (name.contains("(基)")) {
-                        name = name.substring(0, name.indexOf("(基)"));
-                    }
                     name = name.replaceAll("[^\u4e00-\u9fa5]", "");
                     drugs.add(name);
                 }