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

structure-center/src/main/java/com/lantone/structure/facade/tran/OperationRecordDocTran.java

@@ -125,9 +125,6 @@ public class OperationRecordDocTran extends TargetTran {
                     }
                     retMap.put("引流材料名称", drainageMaterialsNameString.toString());
                 }
-//                if (operationRecordLabel.getDrainageMaterialsName() != null && StringUtils.isNotEmpty(operationRecordLabel.getDrainageMaterialsName().getName())) {
-//                    retMap.put("引流材料名称", operationRecordLabel.getDrainageMaterialsName().getName());
-//                }
                 //放置部位
                 if (ListUtil.isNotEmpty(operationRecordLabel.getPlacePositions())) {
                     for (PlacePosition PlacePositions : operationRecordLabel.getPlacePositions()) {
@@ -141,9 +138,6 @@ public class OperationRecordDocTran extends TargetTran {
                     }
                     retMap.put("放置部位", placePositionString.toString());
                 }
-//                if (operationRecordLabel.getPlacePosition() != null && StringUtils.isNotEmpty(operationRecordLabel.getPlacePosition().getName())) {
-//                    retMap.put("放置部位", operationRecordLabel.getPlacePosition().getName());
-//                }
 
                 //引流材料数目
                 if (ListUtil.isNotEmpty(operationRecordLabel.getDrainageMaterialsAmounts())) {
@@ -161,9 +155,6 @@ public class OperationRecordDocTran extends TargetTran {
                         retMap.put("引流材料数目",integer+"根");
                     }
                 }
-//                if (operationRecordLabel.getDrainageMaterialsAmount() != null && StringUtils.isNotEmpty(operationRecordLabel.getDrainageMaterialsAmount().getName())) {
-//                    retMap.put("引流材料数目", operationRecordLabel.getDrainageMaterialsAmount().getName());
-//                }
 
 
             }
@@ -205,10 +196,15 @@ public class OperationRecordDocTran extends TargetTran {
 
     private Map<String, String> cutWord(String text) {
         Map<String, String> sourceMap = Maps.newHashMap();
-        text = text.replace("年  月  日  时  分", "").replace("第1次手术", "")
-                .replace("（包括体位、切口处理经过，病理标本肉眼所见）", "");
+        if (text.contains("问题错误")) {
+            text = text.substring(0, text.indexOf("问题错误"));
+        }
+        text = text.replace("年  月  日  时  分", "").replace("年 月 日 时 分","")
+                .replace("第1次手术", "")
+                .replace("（包括体位、切口处理经过，病理标本肉眼所见）", "")
+                .replace("\\r", "");
         List<String> titles = CommonAnalysisUtil.sortTitles(
-                Lists.newArrayList("手术开始时间", "手术结束时间", "术前诊断", "手术名称", "术中诊断", "手 术 者", "手术人员", "助手",
+                Lists.newArrayList("手术开始时间", "手术结束时间", "术前诊断", "手术名称", "术中诊断", "手 术 者", "手术人员", "助手", "护婴者",
                         "麻醉方法", "麻醉方式", "麻 醉 者", "麻醉医师", "手术标本", "手术切除标本", "术中并发症", "术中失血量", "术中输血量", "手术简要经过（包括“术中所见”）",
                         "手术经过", "术后情况及诊疗计划", "术后注意事项", "记录者", "主刀医生", "医生签名", "主刀医师签名", "记录时间", "患者或代理人签名", "与病人关系"),
                 text
@@ -241,7 +237,7 @@ public class OperationRecordDocTran extends TargetTran {
             }
 
             CommonAnalysisUtil.removeKey(sourceMap, "术前诊断", "术中诊断", "⒈患者基本情况", "⒉拟实施的输血方案", "手术标本", "手术切除标本", "术中并发症",
-                    "与病人关系", "术后情况及诊疗计划", "术后注意事项");
+                    "与病人关系", "术后情况及诊疗计划", "术后注意事项", "护婴者");
         }
         return sourceMap;
     }