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

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

@@ -54,9 +54,9 @@ public class YiWuClinicalBloodDocTrans extends ModelDocTrans {
             "医生=记录医生",
             "记录医师=记录医生",
             "结束时间=输注结束",
-            "病历日期=记录时间",
             "内容=输注后效果评价",
-            "病程内容=病情记录"
+            "病程内容=病情记录",
+            "医师签名=记录医生"
     );
 
 }

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

@@ -44,8 +44,8 @@ public class YiWuRescueDocTrans extends ModelDocTrans {
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
             if (structureMap.containsKey("原始文本")) {
                 String originalText = structureMap.get("原始文本");
-                List<String> titles = Lists.newArrayList("抢救实施的时间及措施", "抢救后的状况", "参加抢救人员姓名及专业技术职称", "医师签名");
-                CommonAnalysisUtil.cutByTitles(originalText, titles, 0, structureMap);
+                List<String> titles = Lists.newArrayList("抢救记录","抢救实施的时间及措施", "抢救后的状况", "参加抢救人员姓名及专业技术职称", "医师签名");
+                CommonAnalysisUtil.cutByTitlesNoColon(originalText, titles, 0, structureMap);
                 if (structureMap.containsKey("抢救措施") && structureMap.containsKey("抢救实施的时间及措施")) {
                     structureMap.put("抢救措施", structureMap.get("抢救措施").replace(structureMap.get("抢救实施的时间及措施"), ""));
                 }
@@ -72,7 +72,9 @@ public class YiWuRescueDocTrans extends ModelDocTrans {
             "参加抢救人员名单=参加抢救的医务人员姓名及专业技术职称",
             "记录医师=记录医生",
             "病程内容=抢救措施",
-            "患者签名时间=记录时间"
+            "患者签名时间=记录时间",
+            "抢救记录=简要病情",
+            "医师签名=记录医生"
     );
 
 }

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

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.doc.StagesSummaryDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
 import java.util.List;
@@ -40,7 +41,16 @@ public class YiWuStagesSummaryDocTrans extends ModelDocTrans {
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+            List<String> titles = Lists.newArrayList("入院时情况", "入院诊断", "辅助检查",
+                    "诊治经过", "目前情况", "目前诊断", "进一步诊疗方案",
+                    "记录医师");
+            String text = sourceMap.get("原始文本");
+            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
+            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
+            if(structureMap.containsKey("病程内容")){
+                structureMap.put("病程内容",structureMap.get("病程内容").split("入院时情况")[0]);
+            }
         }
 
         StagesSummaryDoc stagesSummaryDoc = new StagesSummaryDoc();
@@ -53,7 +63,10 @@ public class YiWuStagesSummaryDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "本人姓名=姓名",
             "现病史- 发病情况=发病情况",
-            "体温(耳)=体温耳"
+            "体温(耳)=体温耳",
+            "医师签名=记录医生",
+            "进一步诊疗方案=诊疗方案",
+            "入院时情况=入院情况"
     );
 
 }