义乌术前讨论记录无指征无术前准备无规则无麻醉方式无注意事项规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/preoperativediscussion/PRE0329.java

@@ -28,8 +28,8 @@ public class PRE0329 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征与禁忌"))) {
-                status.set("-1");
+                    && StringUtil.isNotBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征与禁忌"))) {
+                status.set("0");
             }
         }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/preoperativediscussion/PRE0331.java

@@ -27,8 +27,8 @@ public class PRE0331 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟施麻醉方式"))) {
-                status.set("-1");
+                    && StringUtil.isNotBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟施麻醉方式"))) {
+                status.set("0");
                 return;
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/preoperativediscussion/PRE0332.java

@@ -27,8 +27,8 @@ public class PRE0332 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备"))) {
-                status.set("-1");
+                    && StringUtil.isNotBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备"))) {
+                status.set("0");
             }
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/preoperativediscussion/PRE0333.java

@@ -27,8 +27,8 @@ public class PRE0333 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主要术中、术后风险及防范措施"))) {
-                status.set("-1");
+                    && StringUtil.isNotBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主要术中、术后风险及防范措施"))) {
+                status.set("0");
             }
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/preoperativediscussion/PRE0334.java

@@ -27,7 +27,7 @@ public class PRE0334 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术中术后注意事项"))) {
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术中术后注意事项含护理事项"))) {
                 status.set("-1");
             }
         }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

@@ -270,13 +270,20 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             List<String> titles = Lists.newArrayList("讨论时间", "讨论地点", "主持人", "经治医师", "讨论意见",
                     "参加人员及技术职称", "讨论方式", "讨论记录", "主持人签名", "记录人签名", "病史摘要", "术前诊断", "术前准备"
                     , "拟施手术", "拟施麻醉", "术中注意点", "家属谈话内容", "医生签名", "日  期", "术前准备情况", "手术指征", "手术方案",
-                    "可能出现的意外及防范措施", "讨论日期时间", "参加人员", "讨论主持人", "小结", "记录医师","手术指征与禁忌症"
-                    ,"拟施手术名称和方式及可能的变更","可替代方案","计划性多次手术","方式",
-                    "术前特殊准备",
-                    "心理状态","经济评估","主要术中、术后风险及防范措施","术中、术后注意事项（含护理事项）");
-            String text = sourceMap.get("原始文本").replaceAll("[0-9:.]","");
+                    "可能出现的意外及防范措施", "讨论日期时间", "参加人员", "讨论主持人", "小结", "记录医师");
+            String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
+            //术前诊断切词去除数字
+            List<String> titles1=Lists.newArrayList("手术指征与禁忌症"
+                    ,"拟施手术名称和方式及可能的变更","可替代方案","计划性多次手术","方式",
+                    "术前特殊准备", "心理状态","经济评估","主要术中、术后风险及防范措施",
+                    "术中、术后注意事项（含护理事项）");
+            if(sourceMap.containsKey("术前诊断")){
+                String text1=sourceMap.get("术前诊断").replaceAll("[0-9:.]","");
+                List<String> sortTitles1 = CommonAnalysisUtil.sortTitles(titles1, text1);
+                CommonAnalysisUtil.cutByTitles(text1, sortTitles1, 0, sourceMap);
+            }
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts, modeId);