妇幼测试trans层bug修改

trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/NingHaiFuYaoOperationDocTrans.java

@@ -331,7 +331,9 @@ public class NingHaiFuYaoOperationDocTrans extends ModelDocTrans {
             "经治医师签名=记录医生",
             "经治医生签字时间=记录时间",
             "主刀医师签名=主刀医生签名",
-            "签字时间=记录时间"
+            "签字时间=记录时间",
+            "手术前诊断=术前诊断",
+            "手术中诊断=术中诊断"
     );
 
     /**********************************************手术知情同意书****************************************************/

trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/NingHaiFuYaoThreeLevelWardDocTrans.java

@@ -77,8 +77,7 @@ public class NingHaiFuYaoThreeLevelWardDocTrans extends ModelDocTrans {
         if (structureMap.containsKey("病情记录")) {
             structureMap.put("病情记录", structureMap.get("病情记录").replace(" ", ""));
         }
-        if(structureMap.containsKey("记录医生")&&StringUtil.isNotBlank(structureMap.get("记录医生"))
-                &&structureMap.get("病情记录").contains("医师签名"))
+        if(structureMap.get("病情记录").contains("医师签名"))
         {
             structureMap.put("病情记录", structureMap.get("病情记录").split("医师签名")[0]);
         }

trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/util/NingHaiFuYaoOperationRecordHtmlAnalysis.java

@@ -111,7 +111,7 @@ public class NingHaiFuYaoOperationRecordHtmlAnalysis implements NingHaiFuYaoHtml
                 "姓名", "性别", "出生日期", "出生年月", "科别", "科室", "病区", "床号", "床位", "住院号","手术开始时间","手术结束时间",
                 "手术时间", "手术日期", "术前诊断", "手术指征", "手术人员", "外邀指导专家","麻醉方式", "麻醉人员", "麻 醉 者", "洗手护士", "本次手术是否属于非计划再次手术", "接生者",
                 "术前胎心", "手术名称", "术后诊断", "手术者及助手名称", "术中取病理标本", "麻醉方法", "手术经过（包括病人体位、切口处理、病灶所见及手术步骤等）",
-                "诊断手术/操作简要经过（包括术中有无并发症及具体描述和处理）", "手术经过","医师签名",
+                "诊断手术/操作简要经过（包括术中有无并发症及具体描述和处理）", "手术经过","医师签名","麻 醉","手术中诊断","手术前诊断",
                 "医生签名", "记录时间", "时间", "手术/操作医生", "记录者", "术中输血", "术前宫颈准备日期", "药物名称及用法", "导管或其他", "插入深度",
                 "阴道填塞纱布条", "准备者", "取出日期", "手术方法", "术中特殊情况", "病理检查", "其他", "记录者", "手术者",
                 "检查子宫位置","开始","结束"
@@ -127,9 +127,10 @@ public class NingHaiFuYaoOperationRecordHtmlAnalysis implements NingHaiFuYaoHtml
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }*/
         String text = NingHaiFuYaoHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
-        text = text.replaceAll("第1页", "");
+        text = text.replaceAll("第1页", "")
+                .replaceAll("_____________________________________________________________________________________","");
         List<String> titles = Lists.newArrayList(
-                "姓名", "病区", "床号", "住院号"
+                "姓名", "病区", "床号", "住院号","年龄"
         );
         titles = CommonAnalysisUtil.sortTitles(titles, text);
         CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, map);