From 720d6f2a5e80371670e421d9e174040ab8adc34d Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Tue, 13 Jun 2023 16:30:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E4=BD=8F=E9=99=A2=E5=8F=B7=E5=92=8C=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E4=B8=BA=E7=A9=BA=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...IP1010LaboratoryReportAdditionHandler.java | 25 ++++++++++-------- ...HIP1011LaboratoryReportUpdatesHandler.java | 26 ++++++++++--------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java index 1ab6d1c..4f9e41b 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java @@ -19,6 +19,7 @@ import java.util.Date; /** * HIP1010-检验报告新增服务 + * * @author jiahsi */ @Service(WebserviceMessageType.HIP1010) @@ -55,15 +56,17 @@ public class HIP1010LaboratoryReportAdditionHandler implements WebserviceReceive Node senderNode = xmlUtil.getNode("/PRPA_HIP1010/sender/device/id/item/@extension"); String sender = senderNode.getNodeValue(); String zdAssortId = ZdAssortConfig.getZdAssortId(sender); - if(Func.isBlank(zdAssortId)){ - zdAssortId=ZdAssortConfig.getOtherAssortId(); + if (Func.isBlank(zdAssortId)) { + zdAssortId = ZdAssortConfig.getOtherAssortId(); } Node inpatientNoNode = xmlUtil.getNode("/PRPA_HIP1010/controlActProcess/subject/encounterEvent/inpNo"); - String inpatientNo = inpatientNoNode.getTextContent(); + String inpatientNoNodeTextContent = inpatientNoNode.getTextContent(); + String inpatientNo = Func.isBlank(inpatientNoNodeTextContent) ? "-1" : inpatientNoNodeTextContent; Node admissTimesNode = xmlUtil.getNode("/PRPA_HIP1010/controlActProcess/subject/encounterEvent/visitId"); - Integer admissTimes = Integer.valueOf(admissTimesNode.getTextContent()); + String admissTimesNodeTextContent = admissTimesNode.getTextContent(); + Integer admissTimes = Func.isBlank(admissTimesNodeTextContent) ? -1 : Integer.parseInt(admissTimesNodeTextContent); // 检查报告单号标识 Node reportFlagNode = xmlUtil.getNode("/PRPA_HIP1010/controlActProcess/subject/encounterEvent/id[@root='2.16.156.10011.1.33']/@extension"); @@ -105,8 +108,8 @@ public class HIP1010LaboratoryReportAdditionHandler implements WebserviceReceive public String insertSuccess(String msgId, String sender, String receiver) { String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); return "" + - "" + - "" + + "" + + "" + "" + "" + "" + @@ -127,7 +130,7 @@ public class HIP1010LaboratoryReportAdditionHandler implements WebserviceReceive "" + "" + "" + - "" + + "" + "" + "" + "" + @@ -147,8 +150,8 @@ public class HIP1010LaboratoryReportAdditionHandler implements WebserviceReceive public String insertFailed(String msgId, String sender, String receiver, String failedMessage) { String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); return "" + - "" + - "" + + "" + + "" + "" + "" + "" + @@ -169,10 +172,10 @@ public class HIP1010LaboratoryReportAdditionHandler implements WebserviceReceive "" + "" + "" + - "" + + "" + "" + "" + - "" + + "" + "" + "" + ""; diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java index 931b66e..a82b650 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java @@ -19,6 +19,7 @@ import java.util.Date; /** * HIP1009-检查报告更新服务 + * * @author jiahsi */ @Service(WebserviceMessageType.HIP1011) @@ -55,15 +56,17 @@ public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveS Node senderNode = xmlUtil.getNode("/PRPA_HIP1011/sender/device/id/item/@extension"); String sender = senderNode.getNodeValue(); String zdAssortId = ZdAssortConfig.getZdAssortId(sender); - if(Func.isBlank(zdAssortId)){ - zdAssortId=ZdAssortConfig.getOtherAssortId(); + if (Func.isBlank(zdAssortId)) { + zdAssortId = ZdAssortConfig.getOtherAssortId(); } Node inpatientNoNode = xmlUtil.getNode("/PRPA_HIP1011/controlActProcess/subject/encounterEvent/inpNo"); - String inpatientNo = inpatientNoNode.getTextContent(); + String inpatientNoNodeTextContent = inpatientNoNode.getTextContent(); + String inpatientNo = Func.isBlank(inpatientNoNodeTextContent) ? "-1" : inpatientNoNodeTextContent; Node admissTimesNode = xmlUtil.getNode("/PRPA_HIP1011/controlActProcess/subject/encounterEvent/visitId"); - Integer admissTimes = Integer.valueOf(admissTimesNode.getTextContent()); + String admissTimesNodeTextContent = admissTimesNode.getTextContent(); + Integer admissTimes = Func.isBlank(admissTimesNodeTextContent) ? -1 : Integer.parseInt(admissTimesNodeTextContent); // 检查报告单号标识 Node reportFlagNode = xmlUtil.getNode("/PRPA_HIP1011/controlActProcess/subject/encounterEvent/id[@root='2.16.156.10011.1.33']/@extension"); @@ -107,8 +110,8 @@ public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveS String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); return "" + - "" + - "" + + "" + + "" + "" + "" + "" + @@ -129,7 +132,7 @@ public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveS "" + "" + "" + - "" + + "" + "" + "" + "" + @@ -150,8 +153,8 @@ public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveS public String updateFailed(String msgId, String sender, String receiver, String failedMessage) { String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); return "" + - "" + - "" + + "" + + "" + "" + "" + "" + @@ -172,15 +175,14 @@ public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveS "" + "" + "" + - "" + + "" + "" + "" + - "" + + "" + "" + "" + ""; } - }