义乌trans修改

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

@@ -73,11 +73,6 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                 sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
                 sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
 
-                //新生儿科姓名+姓名问题解决
-                if (sourceMap.containsKey("姓名")) {
-                    String value = sourceMap.get("姓名").split(" ")[0];
-                    sourceMap.put("姓名", value);
-                }
                 //产科孕产次
                 if (sourceMap.containsKey("入院记录")) {
                     String value = sourceMap.get("入院记录").split(" ")[0];
@@ -108,6 +103,11 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
             OrdinaryAssistant.removeBlank(structureMap);
         }
+        //姓名+姓名问题解决
+        if (structureMap.containsKey("姓名")) {
+            String value = structureMap.get("姓名").split(" ")[0];
+            structureMap.put("姓名", value);
+        }
         //日间病历拼接入院情况
         if (structureMap.containsKey("现病史") && structureMap.containsKey("既往史")) {
             structureMap.put("入院情况", structureMap.get("现病史") + structureMap.get("既往史"));

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

@@ -50,14 +50,14 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
         Map<String, OperationRecordDoc> operationRecordDocMap = getOperationRecordDocMap((List) contentMap.get("手术记录"));
         Map<String, PreoperativeDiscussionDoc> preoperativeDiscussionDocMap = getPreoperativeDiscussionDocMap((List) contentMap.get("术前讨论、术前小结"));
         Map<String, OperationInformedConsentDoc> operationInformedConsentDocMap = getOperationInformedConsentDocMap((List) contentMap.get("手术知情同意书"));
-        Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap((List) contentMap.get("手术安全核查表"));
+        //Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap((List) contentMap.get("手术安全核查表"));
 
         Set<String> operationNameSet = Sets.newHashSet();
         operationNameSet.addAll(operationDiscussionDocMap.keySet());
         operationNameSet.addAll(operationRecordDocMap.keySet());
         operationNameSet.addAll(preoperativeDiscussionDocMap.keySet());
         operationNameSet.addAll(operationInformedConsentDocMap.keySet());
-        operationNameSet.addAll(operationSafetyChecklistDocMap.keySet());
+        //operationNameSet.addAll(operationSafetyChecklistDocMap.keySet());
 
         operationNameSet.forEach(operationName -> {
             OperationDoc operationDoc = new OperationDoc();
@@ -66,7 +66,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             operationDoc.setOperationRecordDoc(operationRecordDocMap.get(operationName));
             operationDoc.setPreoperativeDiscussionDoc(preoperativeDiscussionDocMap.get(operationName));
             operationDoc.setOperationInformedConsentDoc(operationInformedConsentDocMap.get(operationName));
-            operationDoc.setOperationSafetyChecklistDoc(operationSafetyChecklistDocMap.get(operationName));
+            //operationDoc.setOperationSafetyChecklistDoc(operationSafetyChecklistDocMap.get(operationName));
             retList.add(operationDoc);
         });
         return retList;