义乌术前讨论字段映射及查房规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0131.java

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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0133.java

@@ -48,6 +48,11 @@ public class THR0133 extends QCCatalogue {
             status.set("0");
             return;
         }
+        if (firstAttendStructureMap.get("病情记录").contains("诊疗计划")) {
+            status.set("0");
+            return;
+        }
+
         ThreeLevelWardLabel firstAttendLabel = firstAttendDoc.getThreeLevelWardLabel();
         if (firstAttendLabel == null) {
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0134.java

@@ -36,7 +36,7 @@ public class THR0134 extends QCCatalogue {
         String admisDateStr = inputInfo.getBeHospitalizedDoc().getStructureMap().get("入院日期");
         String recordDateStr = firstAttendStructureMap.get("查房日期");
         String content = firstAttendStructureMap.get("病情记录");
-        if (content.contains("诊断明确") || content.contains("同意目前诊断") || content.contains("目前考虑")) {
+        if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑")) {
             status.set("0");
             return;
         }

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

@@ -289,10 +289,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     "可能出现的意外及防范措施", "讨论日期时间", "参加人员", "讨论主持人", "小结", "记录医师", "手术指征与禁忌症"
                     , "拟施手术名称和方式及可能的变更", "可替代方案", "计划性多次手术",
                     "术前特殊准备", "心理状态", "经济评估", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）",
-                    "一：经治医师汇报病史", "二：讨论目的", "三：讨论");
+                    "一：经治医师汇报病史", "二：讨论目的", "三：讨论","主持人的姓名及专业技术职务","参加讨论者的姓名及专业技术职务","记录医师签名");
             String text = sourceMap.get("原始文本");
-            List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
-            CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
+            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
+            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             if(sourceMap.containsKey("术前诊断")){
@@ -362,7 +362,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "麻醉方式=拟施麻醉方式",
             "拟施手术名称和方式及可能的变更=拟施手术方式名称及可能的变更与禁忌症",
             "手术要点=主要术中、术后风险及防范措施",
-            "病历内容=简要病情"
+            "病历内容=简要病情",
+            "参加讨论者的姓名及专业技术职务=参加人员",
+            "主持人的姓名及专业技术职务=讨论主持人"
     );
 
     /**********************************************手术知情同意书****************************************************/