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

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

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
@@ -35,6 +36,11 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            List<String> titles = Lists.newArrayList("病历记录时间","一、病例特点","二、初步诊断","三、诊断依据"
+                    ,"四、鉴别诊断","五、诊疗计划","记录医师");
+            String text = sourceMap.get("原始文本");
+            List<String> sortTitles= CommonAnalysisUtil.sortTitles(titles,text);
+            CommonAnalysisUtil.cutByTitles(text,sortTitles,0,sourceMap);
             Map<String, String> changeKeyMap = Maps.newHashMap();
             Iterator<Map.Entry<String, String>> it = sourceMap.entrySet().iterator();
             while (it.hasNext()) {

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

@@ -181,11 +181,11 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            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);
@@ -229,7 +229,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "医师签名时间=记录时间",
             "医师签名=记录医生",
             "手术过程=手术经过及处理",
-            "手术简要经过（包括“术中所见”）=手术经过及处理"
+            "手术简要经过（包括“术中所见”）=手术经过及处理",
+            "第一助手=助手医师",
+            "洗手护士=手术护士",
+            "手术经过=手术经过及处理"
     );