wangsy преди 3 години
родител
ревизия
cbfb891bb3

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

@@ -52,7 +52,7 @@ public class BEH0372 extends QCCatalogue {
         }
 
         if ((bhbasicInfoStatus.equals("离婚") || bhbasicInfoStatus.equals("离异")) &&
-                (basicInfoStatus.contains("离异") || basicInfoStatus.equals("离婚"))) {
+                (basicInfoStatus.contains("离异") || basicInfoStatus.contains("离婚"))) {
             status.set("0");
             return;
         }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0162.java

@@ -19,7 +19,7 @@ import java.util.Map;
  */
 @Component
 public class FIRP0162 extends QCCatalogue {
-    private List<String> containList = Arrays.asList("-", "—", "拒", "无", "不详", "未上户口");
+    private List<String> containList = Arrays.asList("-", "—", "拒", "无", "不详", "未上户口","未提供");
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");

+ 2 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0166.java

@@ -29,6 +29,8 @@ public class FIRP0166 extends QCCatalogue {
             if (StringUtil.isBlank(firstAdmissionMarry) || StringUtil.isBlank(admissionMarry)) {
                 return;
             }
+            firstAdmissionMarry = firstAdmissionMarry.replace("离异","离婚");
+            admissionMarry = admissionMarry.replace("离异","离婚");
             if (!CatalogueUtil.compareToken(firstAdmissionMarry, admissionMarry)) {
                 status.set("-1");
             }

+ 0 - 11
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0248.java

@@ -27,17 +27,6 @@ public class FIRP0248 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             int rescueNum = inputInfo.getRescueDocs().size();
-            int noRescueNum = 0;
-            if(ListUtil.isNotEmpty(inputInfo.getRescueDocs())){
-                for (RescueDoc rescueDoc : inputInfo.getRescueDocs()) {
-                    String endFile = rescueDoc.getStructureMap().get("抢救结果");
-                    if(endFile.contains("放弃")){
-                        noRescueNum++;
-                    }
-                }
-            }
-            rescueNum = rescueNum-noRescueNum;
-
             boolean match = false;
 
             String fpRescueNumStr = firstpageStructureMap.get("病人抢救次数");

+ 2 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0250.java

@@ -73,7 +73,8 @@ public class FIRP0250 extends QCCatalogue {
             // 跟医学部确认,从抢救措施中读取数据
             String key = getKeyByHospitalId();
             String qjgc = structureMap.get(key);
-            if (StringUtil.isNotBlank(qjgc) && !qjgc.contains("死亡")) {
+            String detail = structureMap.get("抢救结果");
+            if ((StringUtil.isNotBlank(qjgc) && !qjgc.contains("死亡")) ||  (StringUtil.isNotBlank(detail) && detail.equals("成功"))) {
                 i++;
             }
         }