From fe3143a1526e83548ebafb642a9a742e0a9d105e Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Mon, 26 Feb 2024 15:47:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=82=87=E5=BA=86=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=BA=BA=E6=B0=91=E5=8C=BB=E9=99=A2=E4=B8=B4=E5=BA=8A=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=92=8C=E6=8A=A4=E7=90=86=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=B6=E5=88=86=E7=A7=92=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=92=8Cjzh=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-config/collect-task-config.json | 16 +++----- .../message/config/CollectTaskConfig.java | 5 +++ .../ZqWsNurseSubmitMessageConvert.java | 37 +++++++++++++----- .../ZqWsRecordSubmitMessageConvert.java | 39 ++++++++++++++----- .../message/dto/TbasicQrPreciseCondition.java | 19 +++++++-- .../server/message/dto/ZqRecordSubmitDTO.java | 6 ++- .../message/dto/ZqWsNurseSubmitDTO.java | 7 +++- .../message/service/UnifyMessageService.java | 3 ++ src/main/resources/mapper/TBasicMapper.xml | 8 ++-- 9 files changed, 99 insertions(+), 41 deletions(-) diff --git a/data-config/collect-task-config.json b/data-config/collect-task-config.json index 3fbcf71..fc722f4 100644 --- a/data-config/collect-task-config.json +++ b/data-config/collect-task-config.json @@ -1,14 +1,10 @@ -[ - { - "method": "WS_RECORD_SUBMIT", - "collectorIds": ["1","2"], - "babyCollectorIds": ["1","2"], - "haveBabyQuery": "" - }, +[{ + "method": "WS_RECORD_SUBMIT", + "collectorIds": ["2", "3", "4", "5", "6", "8"] + +}, { "method": "WS_NURS_SUBMIT", - "collectorIds": ["3"], - "babyCollectorIds": ["1","2"], - "haveBabyQuery": "" + "collectorIds": ["1"] } ] \ No newline at end of file diff --git a/src/main/java/com/docus/server/message/config/CollectTaskConfig.java b/src/main/java/com/docus/server/message/config/CollectTaskConfig.java index ac2d64f..5bc19a1 100644 --- a/src/main/java/com/docus/server/message/config/CollectTaskConfig.java +++ b/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 babyCollectorIds; private String haveBabyQuery; } + + public static void main(String[] args) { + TaskConfig taskConfig = getTaskConfig(""); + } } diff --git a/src/main/java/com/docus/server/message/converters/ZqWsNurseSubmitMessageConvert.java b/src/main/java/com/docus/server/message/converters/ZqWsNurseSubmitMessageConvert.java index 3ec6acd..ab0dcd8 100644 --- a/src/main/java/com/docus/server/message/converters/ZqWsNurseSubmitMessageConvert.java +++ b/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; - String disDate = null; + Date admissDate = 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.formatDateTime(admissDateTime); + admissDate = Func.parseDate(admissTime.trim(), DateUtil.PATTERN_DATETIME); } } 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.formatDateTime(disDateTime); + disDate = Func.parseDate(disTime.trim(), DateUtil.PATTERN_DATETIME); } } 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.setDisDate(dto.getDisDate()); + condition.setAdmissDateBegin(admissDateBegin); + condition.setAdmissDateEnd(admissDateEnd); + condition.setDisDateBegin(disDateBegin); + condition.setDisDateEnd(disDateEnd); condition.setName(dto.getName()); return condition; } diff --git a/src/main/java/com/docus/server/message/converters/ZqWsRecordSubmitMessageConvert.java b/src/main/java/com/docus/server/message/converters/ZqWsRecordSubmitMessageConvert.java index 7892d58..d4415d2 100644 --- a/src/main/java/com/docus/server/message/converters/ZqWsRecordSubmitMessageConvert.java +++ b/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; - String disDate = null; + Date admissDate = 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.formatDateTime(admissDateTime); + admissDate = Func.parseDate(admissTime.trim(), DateUtil.PATTERN_DATETIME); } } 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.formatDateTime(disDateTime); + disDate = Func.parseDate(disTime.trim(), DateUtil.PATTERN_DATETIME); } } 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.setDisDate(dto.getDisDate()); + condition.setAdmissDateBegin(admissDateBegin); + condition.setAdmissDateEnd(admissDateEnd); + condition.setDisDateBegin(disDateBegin); + condition.setDisDateEnd(disDateEnd); condition.setName(dto.getName()); return condition; } diff --git a/src/main/java/com/docus/server/message/dto/TbasicQrPreciseCondition.java b/src/main/java/com/docus/server/message/dto/TbasicQrPreciseCondition.java index 2811fc8..8702740 100644 --- a/src/main/java/com/docus/server/message/dto/TbasicQrPreciseCondition.java +++ b/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; } diff --git a/src/main/java/com/docus/server/message/dto/ZqRecordSubmitDTO.java b/src/main/java/com/docus/server/message/dto/ZqRecordSubmitDTO.java index af64620..9d59a08 100644 --- a/src/main/java/com/docus/server/message/dto/ZqRecordSubmitDTO.java +++ b/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 */ diff --git a/src/main/java/com/docus/server/message/dto/ZqWsNurseSubmitDTO.java b/src/main/java/com/docus/server/message/dto/ZqWsNurseSubmitDTO.java index 15e87e3..8cdc842 100644 --- a/src/main/java/com/docus/server/message/dto/ZqWsNurseSubmitDTO.java +++ b/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 */ diff --git a/src/main/java/com/docus/server/message/service/UnifyMessageService.java b/src/main/java/com/docus/server/message/service/UnifyMessageService.java index dd64e61..05baec7 100644 --- a/src/main/java/com/docus/server/message/service/UnifyMessageService.java +++ b/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); + + + } diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index 073c6fc..c8ecaf5 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -64,11 +64,11 @@ and tb.name=#{condition.name} - - and tb.dis_date=#{condition.disDate} + + and tb.dis_date between #{condition.disDateBegin} and #{condition.disDateEnd} - - and tb.admiss_date=#{condition.admissDate} + + and tb.admiss_date between #{condition.admissDateBegin} and #{condition.admissDateEnd} and tb.jzh=#{condition.jzh}