Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

# Conflicts:
#	trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -110,8 +110,8 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
-//            String text = BeiLunHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
-//            operationDiscussionDoc.setText(text);
+            String text = BeiLunHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
+            operationDiscussionDoc.setText(text);
             operationDiscussionDoc.setPageData((Map) structureMap);
             return operationDiscussionDoc;
         } else {

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

@@ -61,6 +61,11 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                 String value = structureMap.get("入院记录").split(" ")[0];
                 structureMap.put("孕产次", value);
             }
+            //产科个人史
+            if(structureMap.containsKey("个人史")){
+                String value =structureMap.get("个人史").split("1")[0];
+                structureMap.put("个人史",value);
+            }
             OrdinaryAssistant.removeBlank(structureMap);
         }
         /*if (StringUtils.isEmpty(structureMap.get("入院时间")) && StringUtils.isNotEmpty(structureMap.get("入病房时间"))) {
@@ -145,7 +150,8 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "修正诊断一医师签名=修正诊断医师签名",
             "患者姓名=姓名",
             "年月日=初步诊断日期",
-            "年月日时分=初步诊断日期"
+            "年月日时分=初步诊断日期",
+            "病历内容=个人史"
 
     );
 

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

@@ -271,6 +271,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             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);
@@ -316,7 +320,13 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "记录人签名=记录医生",
             "医生签名=记录医生",
             "讨论记录=讨论意见",
-            "患者签名日期=讨论时间"
+            "患者签名日期=讨论时间",
+            "记录医师=记录医生",
+            "讨论日期时间=讨论时间",
+            "可能出现的意外及防范措施=主要术中、术后风险及防范措施",
+            "术前准备情况=术前准备",
+            "手术指征=手术指征与禁忌",
+            "手术方案=拟施手术方式名称及可能的变更与禁忌症"
     );
 
     /**********************************************手术知情同意书****************************************************/