手术记录、出院小结映射和页面调整

trans/src/main/java/com/lantone/qc/trans/shengzhouyy/LeaveHospitalDocTrans.java

@@ -10,6 +10,7 @@ import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -29,15 +30,23 @@ public class LeaveHospitalDocTrans extends ModelDocTrans {
             /*List<String> titles = Lists.newArrayList("入院时间", "出院时间", "住院天数", "入院诊断", "出院诊断"
                     , "入院情况", "住院经过", "出院情况", "出院医嘱", "记录医生","记录时间", "出院指导");*/
 //        随访计划：随访日期:2021年03月21日；随访周期建议:每2周；随访方式:电话
-            List<String> titles = Lists.newArrayList("出院医嘱", "出院指导", "随访计划", "随访日期"
-                    , "随访周期建议", "随访方式", "一般随访比例", "专科随访比例",
-                    "不适宜随访比例", "未写随访比例", "医生签名", "时    间");
+            List<String> titles = Lists.newArrayList("出院医嘱", "出院指导", "随访日期", "随访计划", "医生签名", "时    间", "一般随访比例");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+            String follow_up_date = sourceMap.get("随访日期");
+            String general_follow_up_ratio = sourceMap.get("一般随访比例");
+            if (StringUtils.isNotBlank(follow_up_date)) {
+                if (StringUtils.isNotBlank(general_follow_up_ratio)) {
+                    sourceMap.put("随访日期", "随访日期:" + follow_up_date + " " + "一般随访比例:" + general_follow_up_ratio);
+                }
+                sourceMap.put("随访日期", "随访日期:" + follow_up_date);
+            } else {
+                sourceMap.put("一般随访比例", "一般随访比例:" + general_follow_up_ratio);
+            }
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
         }
         LeaveHospitalDoc leaveHospitalDoc = new LeaveHospitalDoc();
@@ -59,7 +68,9 @@ public class LeaveHospitalDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "时    间=时间"
+            "时    间=时间",
+            "随访日期=随访计划",
+            "一般随访比例=随访计划"
          /*   "本人姓名=姓名",
             "实际住院天数=住院天数",
             "出院时情况=出院情况",

trans/src/main/java/com/lantone/qc/trans/shengzhouyy/OperationDocTrans.java

@@ -188,8 +188,8 @@ public class OperationDocTrans extends ModelDocTrans {
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             List<String> titles = Lists.newArrayList("手术开始时间", "手术结束时间", "术中诊断", "手术简要经过", "主    刀",
                     "第一助手", "第二助手", "第三助手", "洗手护士", "巡回护士", "麻醉方式", "手术方式", "麻醉医师", "手术标本", "冰冻切片结果",
-                    "术中并发症", "术中失血量", "手术经过及处理", "手术简要经过", "医师签名", "主刀医师签名", "时间",
-                    "患方签名", "记录时间");
+                    "术中并发症", "术中失血量", "手术经过及处理", "手术简要经过", "手术经过", "医师签名", "主刀医师签名", "时间", "术后生命体征",
+                    "术后出血量", "患方签名", "记录时间","待产日期","手术名称","术后诊断");
 
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
@@ -229,13 +229,17 @@ public class OperationDocTrans extends ModelDocTrans {
             "主刀医师=主刀医师",
             "Ⅰ助姓名=一助",
             "Ⅱ助姓名=二助",
-            "手术记录麻醉方式=麻醉方式",
+            "手术记录麻醉方式=麻醉体位",
             "麻醉医师签名=麻醉医师",
+            "麻醉医师签名=麻醉人员",
             "主刀医师签名=医师签名",
             "医师签名=医师签名",
             "记录时间=医师签名时间",
-            "时间=医师签名时间"
+            "时间=医师签名时间",
+            "观察时间=术后观察时间",
+            "手术方式=手术名称"
     );
+
     /**********************************************术前讨论、术前小结****************************************************/
     private Map<String, PreoperativeDiscussionDoc> getPreoperativeDiscussionDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, PreoperativeDiscussionDoc> retMap = Maps.newHashMap();