|
@@ -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>() {
|