Merge branch 'dev-1.2' of http://192.168.2.236:10080/louhr/qc into dev-1.2

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfBeHospitalizedDocTrans.java

@@ -90,7 +90,8 @@ public class ShaoyfBeHospitalizedDocTrans extends ModelDocTrans {
             "家属提供的信息可信吗=病史可靠性",
             "入院诊断(中医疾病)=中医诊断",
             "长期用药情况(包括可能成瘾的药物)=长期用药",
-            "体温(口)=体温"
+            "体温(口)=体温",
+            "复诊科室=科别"
     );
 
 

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfTransferRecordDocTrans.java

@@ -55,18 +55,19 @@ public class ShaoyfTransferRecordDocTrans extends ModelDocTrans {
             }
         });
         for (TransferIntoDoc transferIntoDoc : transferIntoDocMap.values()) {
-            Map<String, String> structureMap = transferIntoDoc.getStructureMap();
-            String inDateStr = structureMap.get("转科日期");
-            if (StringUtil.isBlank(inDateStr)) {
-                continue;
-            }
-            Date inDate = StringUtil.parseDateTime(inDateStr);
-            if (inDate == null) {
-                continue;
-            }
-            dateRecordIn.put(inDate, transferIntoDoc);
+//            Map<String, String> structureMap = transferIntoDoc.getStructureMap();
+//            String inDateStr = structureMap.get("转科日期");
+//            if (StringUtil.isBlank(inDateStr)) {
+//                continue;
+//            }
+//            Date inDate = StringUtil.parseDateTime(inDateStr);
+//            if (inDate == null) {
+//                continue;
+//            }
+//            dateRecordIn.put(inDate, transferIntoDoc);
+            transferRecordDoc.getTransferIntoDocs().add(transferIntoDoc);
         }
-        transferRecordDoc.setTransferIntoDocs(new ArrayList<>(dateRecordIn.values()));
+//        transferRecordDoc.setTransferIntoDocs(new ArrayList<>(dateRecordIn.values()));
         //转出
         Map<Date, TransferOutDoc> dateRecordOut = new TreeMap<>(new Comparator<Date>() {
             @Override
@@ -76,18 +77,19 @@ public class ShaoyfTransferRecordDocTrans extends ModelDocTrans {
             }
         });
         for (TransferOutDoc transferOutDoc : transferOutDocMap.values()) {
-            Map<String, String> structureMap = transferOutDoc.getStructureMap();
-            String outDateStr = structureMap.get("转科日期");
-            if (StringUtil.isBlank(outDateStr)) {
-                continue;
-            }
-            Date outDate = StringUtil.parseDateTime(outDateStr);
-            if (outDate == null) {
-                continue;
-            }
-            dateRecordOut.put(outDate, transferOutDoc);
+//            Map<String, String> structureMap = transferOutDoc.getStructureMap();
+//            String outDateStr = structureMap.get("转科日期");
+//            if (StringUtil.isBlank(outDateStr)) {
+//                continue;
+//            }
+//            Date outDate = StringUtil.parseDateTime(outDateStr);
+//            if (outDate == null) {
+//                continue;
+//            }
+//            dateRecordOut.put(outDate, transferOutDoc);
+            transferRecordDoc.getTransferOutDocs().add(transferOutDoc);
         }
-        transferRecordDoc.setTransferOutDocs(new ArrayList<>(dateRecordOut.values()));
+//        transferRecordDoc.setTransferOutDocs(new ArrayList<>(dateRecordOut.values()));
 
         //全部转科记录
         Map<Date, TransferRecordDoc> dateRecordAll = new TreeMap<>(new Comparator<Date>() {