浏览代码

北仑:主任主治首次查房优化

wangsy 4 年之前
父节点
当前提交
5b10a1654e

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

@@ -48,7 +48,8 @@ public class BEH0372 extends QCCatalogue {
         }
 
         if (bhbasicInfoStatus.equals("丧偶") &&
-                (basicInfoStatus.contains("已故") || basicInfoStatus.contains("丧偶") || basicInfoStatus.contains("亡故") || basicInfoStatus.contains("已逝"))) {
+                (basicInfoStatus.contains("已故") || basicInfoStatus.contains("丧偶") || basicInfoStatus.contains("去世") ||
+                        basicInfoStatus.contains("亡故") || basicInfoStatus.contains("已逝"))) {
             status.set("0");
             return;
         }

+ 5 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0134.java

@@ -61,7 +61,11 @@ public class THR0134 extends QCCatalogue {
                 if (operationDoc.getOperationRecordDoc() != null) {
                     Map<String, String> structureMap = operationDoc.getOperationRecordDoc().getStructureMap();
                     String opeEndDate = structureMap.get("手术结束时间");
-                    if (opeEndDate.contains("年月日")) {
+                    if (StringUtil.isBlank(opeEndDate)) {
+                        opeEndDate = structureMap.get("记录时间");
+                    }
+                    String regex = ".*\\d.*";
+                    if (!opeEndDate.matches(regex)) {
                         continue;
                     }
                     if (StringUtil.isNotBlank(opeEndDate) &&

+ 5 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0139.java

@@ -62,7 +62,11 @@ public class THR0139 extends QCCatalogue {
                 if (operationDoc.getOperationRecordDoc() != null) {
                     Map<String, String> structureMap = operationDoc.getOperationRecordDoc().getStructureMap();
                     String opeEndDate = structureMap.get("手术结束时间");
-                    if (opeEndDate.contains("年月日")) {
+                    if (StringUtil.isBlank(opeEndDate)) {
+                        opeEndDate = structureMap.get("记录时间");
+                    }
+                    String regex = ".*\\d.*";
+                    if (!opeEndDate.matches(regex)) {
                         continue;
                     }
                     if (StringUtil.isNotBlank(opeEndDate) &&