Kaynağa Gözat

Merge branch 'beilun/dev-fqw' into beilun/dev

fangqw 4 yıl önce
ebeveyn
işleme
45da04ac57

+ 4 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH02902.java

@@ -36,13 +36,15 @@ public class BEH02902 extends QCCatalogue {
         if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺")
                 || pacsText.contains("暂无")|| pacsText.contains("院")
                 || pacsText.contains("病理")
-                || pacsText.contains("科") || pacsText.contains("公司"))) {
+                || pacsText.contains("科") || pacsText.contains("公司")
+                || pacsText.contains("社区卫生服务中心"))) {
             status.set("0");
             return;
         }
         if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("暂缺")
                 || pacsText1.contains("暂无") || pacsText1.contains("院")
-                || pacsText1.contains("科")|| pacsText1.contains("公司"))) {
+                || pacsText1.contains("科")|| pacsText1.contains("公司")
+                || pacsText.contains("社区卫生服务中心"))) {
             status.set("0");
             return;
         }

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0131.java

@@ -57,6 +57,7 @@ public class THR0131 extends QCCatalogue {
         String conditionRecord = firstAttendStructureMap.get("病情记录");
         if (StringUtil.isNotBlank(conditionRecord)) {
             if (conditionRecord.contains("鉴别")
+                    || conditionRecord.matches(".*诊断.*明确.*")
                     || conditionRecord.contains("诊断明确")) {
                 status.set("0");
                 return;

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0136.java

@@ -58,6 +58,7 @@ public class THR0136 extends QCCatalogue {
         String conditionRecord = firstDirectStructureMap.get("病情记录");
         if (StringUtil.isNotBlank(conditionRecord)) {
             if (conditionRecord.contains("鉴别")
+                    || conditionRecord.matches(".*诊断.*明确.*")
                     || conditionRecord.contains("诊断明确")) {
                 status.set("0");
                 return;