fix:肇庆第一人民医院临床提交和护理提交，取消时分秒日期匹配和jzh匹配

data-config/collect-task-config.json

@@ -1,14 +1,10 @@
-[
+[{
-  {
+  "method": "WS_RECORD_SUBMIT",
-    "method": "WS_RECORD_SUBMIT",
+  "collectorIds": ["2", "3", "4", "5", "6", "8"]
-    "collectorIds": ["1","2"],
+
-    "babyCollectorIds": ["1","2"],
+},
-    "haveBabyQuery": ""
-  },
   {
     "method": "WS_NURS_SUBMIT",
-    "collectorIds": ["3"],
+    "collectorIds": ["1"]
-    "babyCollectorIds": ["1","2"],
-    "haveBabyQuery": ""
   }
 ]

src/main/java/com/docus/server/message/config/CollectTaskConfig.java

@@ -18,6 +18,7 @@ public class CollectTaskConfig {
         Objects.requireNonNull(method);
         TableJsonRead jsonReader = new TableJsonRead();
         String taskConfigJson = jsonReader.ReadContent(CONFIG_FILE_PATH, CONFIG_FILE_NAME);
+        System.out.println(taskConfigJson);
         if (taskConfigJson == null) {
             return null;
         }
@@ -40,4 +41,8 @@ public class CollectTaskConfig {
         private List<String> babyCollectorIds;
         private String haveBabyQuery;
     }
+
+    public static void main(String[] args) {
+        TaskConfig taskConfig = getTaskConfig("");
+    }
 }

src/main/java/com/docus/server/message/converters/ZqWsNurseSubmitMessageConvert.java

@@ -9,6 +9,7 @@ import com.docus.server.message.util.XmlUtil;
 import org.w3c.dom.Node;
 
 import java.util.Date;
+import java.util.Objects;
 
 public class ZqWsNurseSubmitMessageConvert {
     public static ZqWsNurseSubmitDTO convert(String str) {
@@ -17,8 +18,8 @@ public class ZqWsNurseSubmitMessageConvert {
         String name = null;
         String submitDate = null;
         Integer admissTimes = null;
-        String admissDate = null;
+        Date admissDate = null;
-        String disDate = null;
+        Date disDate = null;
         XmlUtil xmlUtil = XmlUtil.of(str);
         try {
             // 住院流水号
@@ -57,8 +58,7 @@ public class ZqWsNurseSubmitMessageConvert {
             Node admissTimeNode = xmlUtil.getNode("/Request/Msg/ADMISS_TIME");
             String admissTime = admissTimeNode.getTextContent();
             if (Func.isNotBlank(admissTime)) {
-                Date admissDateTime = Func.parseDate(admissTime.trim(), DateUtil.PATTERN_DATETIME);
+                admissDate = Func.parseDate(admissTime.trim(), DateUtil.PATTERN_DATETIME);
-                admissDate = Func.formatDateTime(admissDateTime);
             }
 
         } catch (Exception ex) {
@@ -69,8 +69,7 @@ public class ZqWsNurseSubmitMessageConvert {
             Node disTimeNode = xmlUtil.getNode("/Request/Msg/DIS_TIME");
             String disTime = disTimeNode.getTextContent();
             if (Func.isNotBlank(disTime)) {
-                Date disDateTime = Func.parseDate(disTime.trim(), DateUtil.PATTERN_DATETIME);
+                disDate = Func.parseDate(disTime.trim(), DateUtil.PATTERN_DATETIME);
-                disDate = Func.formatDateTime(disDateTime);
             }
 
         } catch (Exception ex) {
@@ -103,12 +102,32 @@ public class ZqWsNurseSubmitMessageConvert {
         if (dto == null) {
             return null;
         }
+        Date dtoAdmissDate = dto.getAdmissDate();
+        Date dtoDisDate = dto.getDisDate();
+
+        String admissDateBegin = null;
+        String admissDateEnd = null;
+        String disDateBegin = null;
+        String disDateEnd = null;
+        if (!Objects.isNull(dtoAdmissDate)) {
+            String admissDateFormatDate = Func.formatDate(dtoAdmissDate);
+            admissDateBegin = admissDateFormatDate + " 00:00:00";
+            admissDateEnd = admissDateFormatDate + " 23:59:59";
+        }
+        if (!Objects.isNull(dtoDisDate)) {
+            String disDateFormatDate = Func.formatDate(dtoDisDate);
+            disDateBegin = disDateFormatDate + " 00:00:00";
+            disDateEnd = disDateFormatDate + " 23:59:59";
+        }
+
         TbasicQrPreciseCondition condition = new TbasicQrPreciseCondition();
-        condition.setJzh(dto.getJzh());
+//        condition.setJzh(dto.getJzh());
         condition.setInpatientNo(dto.getInpatientNo());
         condition.setAdmissTimes(dto.getAdmissTimes());
-        condition.setAdmissDate(dto.getAdmissDate());
+        condition.setAdmissDateBegin(admissDateBegin);
-        condition.setDisDate(dto.getDisDate());
+        condition.setAdmissDateEnd(admissDateEnd);
+        condition.setDisDateBegin(disDateBegin);
+        condition.setDisDateEnd(disDateEnd);
         condition.setName(dto.getName());
         return condition;
     }

src/main/java/com/docus/server/message/converters/ZqWsRecordSubmitMessageConvert.java

@@ -9,6 +9,7 @@ import com.docus.server.message.util.XmlUtil;
 import org.w3c.dom.Node;
 
 import java.util.Date;
+import java.util.Objects;
 
 public class ZqWsRecordSubmitMessageConvert {
     public static ZqRecordSubmitDTO convert(String str) {
@@ -17,8 +18,8 @@ public class ZqWsRecordSubmitMessageConvert {
         String name = null;
         String submitDate = null;
         Integer admissTimes = null;
-        String admissDate = null;
+        Date admissDate = null;
-        String disDate = null;
+        Date disDate = null;
         XmlUtil xmlUtil = XmlUtil.of(str);
         try {
             // 住院流水号
@@ -57,8 +58,7 @@ public class ZqWsRecordSubmitMessageConvert {
             Node admissTimeNode = xmlUtil.getNode("/Request/Msg/ADMISS_TIME");
             String admissTime = admissTimeNode.getTextContent();
             if (Func.isNotBlank(admissTime)) {
-                Date admissDateTime = Func.parseDate(admissTime.trim(), DateUtil.PATTERN_DATETIME);
+                admissDate = Func.parseDate(admissTime.trim(), DateUtil.PATTERN_DATETIME);
-                admissDate = Func.formatDateTime(admissDateTime);
             }
 
         } catch (Exception ex) {
@@ -69,8 +69,7 @@ public class ZqWsRecordSubmitMessageConvert {
             Node disTimeNode = xmlUtil.getNode("/Request/Msg/DIS_TIME");
             String disTime = disTimeNode.getTextContent();
             if (Func.isNotBlank(disTime)) {
-                Date disDateTime = Func.parseDate(disTime.trim(), DateUtil.PATTERN_DATETIME);
+                disDate = Func.parseDate(disTime.trim(), DateUtil.PATTERN_DATETIME);
-                disDate = Func.formatDateTime(disDateTime);
             }
 
         } catch (Exception ex) {
@@ -99,15 +98,35 @@ public class ZqWsRecordSubmitMessageConvert {
     }
 
     public static TbasicQrPreciseCondition convert(ZqRecordSubmitDTO dto) {
-        if (dto==null) {
+        if (dto == null) {
             return null;
         }
+        Date dtoAdmissDate = dto.getAdmissDate();
+        Date dtoDisDate = dto.getDisDate();
+
+        String admissDateBegin = null;
+        String admissDateEnd = null;
+        String disDateBegin = null;
+        String disDateEnd = null;
+        if (!Objects.isNull(dtoAdmissDate)) {
+            String admissDateFormatDate = Func.formatDate(dtoAdmissDate);
+            admissDateBegin = admissDateFormatDate + " 00:00:00";
+            admissDateEnd = admissDateFormatDate + " 23:59:59";
+        }
+        if (!Objects.isNull(dtoDisDate)) {
+            String disDateFormatDate = Func.formatDate(dtoDisDate);
+            disDateBegin = disDateFormatDate + " 00:00:00";
+            disDateEnd = disDateFormatDate + " 23:59:59";
+        }
+
         TbasicQrPreciseCondition condition = new TbasicQrPreciseCondition();
-        condition.setJzh(dto.getJzh());
+//        condition.setJzh(dto.getJzh());
         condition.setInpatientNo(dto.getInpatientNo());
         condition.setAdmissTimes(dto.getAdmissTimes());
-        condition.setAdmissDate(dto.getAdmissDate());
+        condition.setAdmissDateBegin(admissDateBegin);
-        condition.setDisDate(dto.getDisDate());
+        condition.setAdmissDateEnd(admissDateEnd);
+        condition.setDisDateBegin(disDateBegin);
+        condition.setDisDateEnd(disDateEnd);
         condition.setName(dto.getName());
         return condition;
     }

src/main/java/com/docus/server/message/dto/TbasicQrPreciseCondition.java

@@ -27,11 +27,22 @@ public class TbasicQrPreciseCondition {
      */
     private String name;
     /**
-     * 入院时间 yyyy-MM-dd HH:mm:ss
+     * 入院时间范围开始 yyyy-MM-dd HH:mm:ss
      */
-    private String admissDate;
+    private String admissDateBegin;
+
+    /**
+     * 入院时间范围结束 yyyy-MM-dd HH:mm:ss
+     */
+    private String admissDateEnd;
+
+    /**
+     * 出院时间范围开始 yyyy-MM-dd HH:mm:ss
+     */
+    private String disDateBegin;
+
     /**
-     * 出院时间 yyyy-MM-dd HH:mm:ss
+     * 出院时间范围结束 yyyy-MM-dd HH:mm:ss
      */
-    private String disDate;
+    private String disDateEnd;
 }

src/main/java/com/docus/server/message/dto/ZqRecordSubmitDTO.java

@@ -2,6 +2,8 @@ package com.docus.server.message.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 肇庆第一人民医院电子病历提交信息
  *
@@ -28,11 +30,11 @@ public class ZqRecordSubmitDTO {
     /**
      * 入院时间 yyyy-MM-dd HH:mm:ss
      */
-    private String admissDate;
+    private Date admissDate;
     /**
      * 出院时间 yyyy-MM-dd HH:mm:ss
      */
-    private String disDate;
+    private Date disDate;
     /**
      * 提交时间 yyyy-MM-dd HH:mm:ss
      */

src/main/java/com/docus/server/message/dto/ZqWsNurseSubmitDTO.java

@@ -1,6 +1,9 @@
 package com.docus.server.message.dto;
 
 import lombok.Data;
+
+import java.util.Date;
+
 /**
  * 肇庆第一人民医院临床护理提交信息
  *
@@ -27,11 +30,11 @@ public class ZqWsNurseSubmitDTO {
     /**
      * 入院时间 yyyy-MM-dd HH:mm:ss
      */
-    private String admissDate;
+    private Date admissDate;
     /**
      * 出院时间 yyyy-MM-dd HH:mm:ss
      */
-    private String disDate;
+    private Date disDate;
     /**
      * 提交时间 yyyy-MM-dd HH:mm:ss
      */

src/main/java/com/docus/server/message/service/UnifyMessageService.java

@@ -13,4 +13,7 @@ public interface UnifyMessageService {
      */
     String pushInformation(@WebParam(name = "method") String method,@WebParam(name = "message") String message);
 
+
+
+
 }

src/main/resources/mapper/TBasicMapper.xml

@@ -64,11 +64,11 @@
         <if test="condition.name != null and condition.name != ''">
             and tb.name=#{condition.name}
         </if>
-        <if test="condition.disDate !=null and condition.disDate != ''">
+        <if test="condition.disDateBegin !=null and condition.disDateBegin != ''">
-            and tb.dis_date=#{condition.disDate}
+            and tb.dis_date between #{condition.disDateBegin} and #{condition.disDateEnd}
         </if>
-        <if test="condition.admissDate!=null and condition.admissDate != ''">
+        <if test="condition.admissDateBegin!=null and condition.admissDateBegin != ''">
-            and tb.admiss_date=#{condition.admissDate}
+            and tb.admiss_date between #{condition.admissDateBegin} and #{condition.admissDateEnd}
         </if>
         <if test="condition.jzh != null and condition.jzh != ''">
             and tb.jzh=#{condition.jzh}