Browse Source

湘雅:部分规则修改

zhanghang 3 years ago
parent
commit
5b82d85987

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

@@ -41,7 +41,7 @@ public class BEH0026 extends QCCatalogue {
         String pastText = pastLabel.getText();
         String pastText = pastLabel.getText();
         if (pastText.contains("食物过敏史") || pastText.contains("食物、药物过敏") || pastText.contains("详见") ||
         if (pastText.contains("食物过敏史") || pastText.contains("食物、药物过敏") || pastText.contains("详见") ||
                 pastText.contains("见旧病历") || pastText.contains("见既往病历") || pastText.contains("食物药物过敏史")
                 pastText.contains("见旧病历") || pastText.contains("见既往病历") || pastText.contains("食物药物过敏史")
-                || pastText.contains("食物及药物过敏史")) {
+                || pastText.contains("食物及药物过敏史") || pastText.contains("食物、药物及其他过敏")) {
             status.set("0");
             status.set("0");
             return;
             return;
         }
         }

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

@@ -37,7 +37,7 @@ public class BEH0034 extends QCCatalogue {
                         .filter(i ->
                         .filter(i ->
                                 i != null && StringUtil.isNotBlank(i.getName()) && i.getNegative() == null
                                 i != null && StringUtil.isNotBlank(i.getName()) && i.getNegative() == null
                                         && !"手术史".equals(i.getName()) && !"手术".equals(i.getName()) && !"手术治疗".equals(i.getName())
                                         && !"手术史".equals(i.getName()) && !"手术".equals(i.getName()) && !"手术治疗".equals(i.getName())
-                                        && !"手术无手术史".equals(i.getName())
+                                        && !"手术无手术史".equals(i.getName())&& !"手术处理".equals(i.getName())&& !"其他手术史".equals(i.getName())
                         )
                         )
                         .map(i -> i.getName())
                         .map(i -> i.getName())
                         .distinct()
                         .distinct()

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

@@ -32,7 +32,8 @@ public class BEH0036 extends QCCatalogue {
             if (operation == null || StringUtil.isBlank(operation.getName())) {
             if (operation == null || StringUtil.isBlank(operation.getName())) {
                 continue;
                 continue;
             }
             }
-            if ("手术史".equals(operation.getName()) || "手术".equals(operation.getName()) || "手术治疗".equals(operation.getName()) || "手术无手术史".equals(operation.getName())) {
+            if ("手术史".equals(operation.getName()) || "其他手术史".equals(operation.getName()) || "手术".equals(operation.getName())
+                    || "手术治疗".equals(operation.getName()) || "手术无手术史".equals(operation.getName()) || "手术处理".equals(operation.getName())) {
                 continue;
                 continue;
             }
             }
             if ((operation.getNegative() == null || StringUtil.isBlank(operation.getNegative().getName()))
             if ((operation.getNegative() == null || StringUtil.isBlank(operation.getNegative().getName()))

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

@@ -80,7 +80,7 @@ public class BEH0058 extends QCCatalogue {
         }
         }
         if (StringUtil.isNotBlank(maritalText)) {
         if (StringUtil.isNotBlank(maritalText)) {
             List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女"
             List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女"
-                    , "0-0-0-0", "详见", "0-0-0-0");
+                    , "0-0-0-0", "详见", "0-0-0-0","无子女");
             for (String word : words) {
             for (String word : words) {
                 if (maritalText.contains(word)) {
                 if (maritalText.contains(word)) {
                     status.set("0");
                     status.set("0");

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/changshaxy/behospitalized/BEH0034.java

@@ -37,7 +37,7 @@ public class BEH0034 extends QCCatalogue {
                         .filter(i ->
                         .filter(i ->
                                 i != null && StringUtil.isNotBlank(i.getName()) && i.getNegative() == null
                                 i != null && StringUtil.isNotBlank(i.getName()) && i.getNegative() == null
                                         && !"手术史".equals(i.getName()) && !"手术".equals(i.getName()) && !"手术治疗".equals(i.getName())
                                         && !"手术史".equals(i.getName()) && !"手术".equals(i.getName()) && !"手术治疗".equals(i.getName())
-                                        && !"手术无手术史".equals(i.getName()) && !"手术处理".equals(i.getName())
+                                        && !"手术无手术史".equals(i.getName()) && !"手术处理".equals(i.getName()) && !"其他手术史".equals(i.getName())
                         )
                         )
                         .map(i -> i.getName())
                         .map(i -> i.getName())
                         .distinct()
                         .distinct()

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/changshaxy/util/XyCrisisValueReportHtmlAnalysis.java

@@ -44,7 +44,8 @@ public class XyCrisisValueReportHtmlAnalysis implements XyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
         }
-        String text = XyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = XyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true)
+                .replace("956", "μ");
         XyCommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         XyCommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(
         List<String> titles = Lists.newArrayList(