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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/dutyshiftsystem/DUT0296.java

@@ -129,7 +129,7 @@ public class DUT0296 extends QCCatalogue {
             String outDepartment = structureMap.get("转出科室");
             if (StringUtil.isBlank(outDepartment)) {
                 //如果转出科室为空，则为转出记录
-                return structureMap.get("转科日期");
+                return structureMap.get("转入日期");
             }
         }
         return null;
@@ -147,7 +147,7 @@ public class DUT0296 extends QCCatalogue {
             String outDepartment = structureMap.get("转出科室");
             if (StringUtil.isNotBlank(outDepartment)) {
                 //如果转出科室不为空，则为转入记录
-                return structureMap.get("转科日期");
+                return structureMap.get("转入日期");
             }
         }
         return null;
@@ -166,13 +166,13 @@ public class DUT0296 extends QCCatalogue {
             String outDepartment = structureMap.get("转出科室");
             if (StringUtil.isNotBlank(outDepartment)) {
                 //如果转出科室不为空，则为转入记录
-                String transferDateInStr = structureMap.get("转科日期");
+                String transferDateInStr = structureMap.get("转入日期");
                 if (i + 1 < allTransferDocs.size()) {
                     //如果转入记录下一条是转出记录
                     Map<String, String> nextStructureMap = allTransferDocs.get(i + 1).getStructureMap();
                     if (StringUtil.isBlank(nextStructureMap.get("转出科室"))) {
                         //如果转出科室为空，则为转出记录
-                        String transferDateOutStr = nextStructureMap.get("转科日期");
+                        String transferDateOutStr = nextStructureMap.get("转入日期");
                         allRecordPairs.add(transferDateInStr + "," + transferDateOutStr);
                     }
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/dutyshiftsystem/DUT0597.java

@@ -31,7 +31,7 @@ public class DUT0597 extends QCCatalogue {
         List<TransferOutDoc> transferOutDocs = transferRecordDoc.getTransferOutDocs();
         for (TransferOutDoc transferOutDoc : transferOutDocs) {
             Map<String, String> transferOutStructureMap = transferOutDoc.getStructureMap();
-            rollOutRecordDateStr = transferOutStructureMap.get("转科日期");
+            rollOutRecordDateStr = transferOutStructureMap.get("转入日期");
             recordDateStr = transferOutStructureMap.get("记录日期");
             if (CatalogueUtil.isEmpty(rollOutRecordDateStr) || CatalogueUtil.isEmpty(recordDateStr)) {
                 continue;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/dutyshiftsystem/DUT0598.java

@@ -31,7 +31,7 @@ public class DUT0598 extends QCCatalogue {
         String rollInRecordDateStr = "", recordDateStr = "";
         for (TransferIntoDoc transferIntoDoc : transferIntoDocs) {
             Map<String, String> transferOutStructureMap = transferIntoDoc.getStructureMap();
-            rollInRecordDateStr = transferOutStructureMap.get("转科日期");
+            rollInRecordDateStr = transferOutStructureMap.get("转入日期");
             recordDateStr = transferOutStructureMap.get("记录日期");
             if (CatalogueUtil.isEmpty(rollInRecordDateStr) || CatalogueUtil.isEmpty(recordDateStr)) {
                 continue;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/dutyshiftsystem/DUT0599.java

@@ -42,7 +42,7 @@ public class DUT0599 extends QCCatalogue {
         List<TransferIntoDoc> transferIntoDocs = transferRecordDoc.getTransferIntoDocs();
         for (TransferIntoDoc transferIntoDoc : transferIntoDocs) {
             Map<String, String> transferOutStructureMap = transferIntoDoc.getStructureMap();
-            rollInRecordDateStr = transferOutStructureMap.get("转科日期");
+            rollInRecordDateStr = transferOutStructureMap.get("转入日期");
             if (CatalogueUtil.isEmpty(rollInRecordDateStr)) {
                 continue;
             }

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

@@ -58,7 +58,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
         });
         for (TransferIntoDoc transferIntoDoc : transferIntoDocMap.values()) {
             Map<String, String> structureMap = transferIntoDoc.getStructureMap();
-            String inDateStr = structureMap.get("转科日期");
+            String inDateStr = structureMap.get("转入日期");
             if (StringUtil.isBlank(inDateStr)) {
                 continue;
             }
@@ -79,7 +79,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
         });
         for (TransferOutDoc transferOutDoc : transferOutDocMap.values()) {
             Map<String, String> structureMap = transferOutDoc.getStructureMap();
-            String outDateStr = structureMap.get("转科日期");
+            String outDateStr = structureMap.get("转入日期");
             if (StringUtil.isBlank(outDateStr)) {
                 continue;
             }
@@ -101,7 +101,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
         });
         for (TransferRecordDoc transferRecordAllDoc : transferAllDocMap.values()) {
             Map<String, String> structureMap = transferRecordAllDoc.getStructureMap();
-            String transferDateStr = structureMap.get("转科日期");
+            String transferDateStr = structureMap.get("转入日期");
             if (StringUtil.isBlank(transferDateStr)) {
                 continue;
             }
@@ -163,6 +163,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
 
     private List<String> transferInto_keyContrasts = Lists.newArrayList(
             "书写日期=记录日期",
+            "转入时间=转入日期",
             "本人姓名=姓名"
     );
 
@@ -251,6 +252,7 @@ public class YiWuTransferRecordDocTrans extends ModelDocTrans {
 
     private List<String> transferOut_keyContrasts = Lists.newArrayList(
             "书写日期=记录日期",
+            "转出时间=转入日期",
             "本人姓名=姓名"
     );