邵逸夫转科 修改

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

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.model.doc.transferrecord.TransferOutDoc;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
@@ -55,19 +56,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
@@ -77,19 +78,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>() {
@@ -222,6 +223,7 @@ public class ShaoyfTransferRecordDocTrans extends ModelDocTrans {
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, transferOut_keyContrasts);
+        MapUtil.keyAssig(structureMap, "记录日期", "书写日期", "病历日期");
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setText(content);