From 8c7a98a02593c7e3e85da6708208f632b5fbf400 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 20 Jun 2024 09:16:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=A1=BA=E5=BE=B7=E4=BA=BA=E5=8C=BBlungFu?= =?UTF-8?q?nction-001=20=E8=82=BA=E5=8A=9F=E8=83=BD=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E8=B5=B0pacs=EF=BC=8C=E4=BD=86=E6=98=AF=E4=B8=8B=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E6=98=AF=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HIP1008InspectionReportAdditionHandler.java | 7 +++++-- .../impl/HIP1009InspectionReportUpdatesHandler.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java index 7cc2f21..0c222db 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java @@ -21,7 +21,9 @@ import org.springframework.stereotype.Service; import org.w3c.dom.Node; import javax.annotation.Resource; +import java.util.Arrays; import java.util.Date; +import java.util.List; /** * HIP1008-检查报告新增服务处理 @@ -202,8 +204,9 @@ public class HIP1008InspectionReportAdditionHandler implements WebserviceReceive Node eafNoNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension"); String eafNo = eafNoNode.getNodeValue(); String serialnum = reportFlag + "@" + eafNo; - // 如果报告单号带下划线是合并报告，取报告单号下划线前的 - if (reportFlag.contains("_")) { + // 如果报告单号带下划线是合并报告，取报告单号下划线前的，可能有个别来源不需要 + List ignoreUnderlineSenders= Arrays.asList("lungFunction-001"); + if (reportFlag.contains("_") && !ignoreUnderlineSenders.contains(sender)) { String[] split = reportFlag.split("_"); serialnum = split[0]; } diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java index 927ad88..75c836b 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java @@ -21,7 +21,9 @@ import org.springframework.stereotype.Service; import org.w3c.dom.Node; import javax.annotation.Resource; +import java.util.Arrays; import java.util.Date; +import java.util.List; /** * HIP1009-检查报告更新服务 @@ -186,8 +188,9 @@ public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveS Node eafNoNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension"); String eafNo = eafNoNode.getNodeValue(); String serialnum = reportFlag + "@" + eafNo; - // 如果报告单号带下划线是合并报告，取报告单号下划线前的 - if (reportFlag.contains("_")) { + // 如果报告单号带下划线是合并报告，取报告单号下划线前的，可能有个别来源不需要 + List ignoreUnderlineSenders= Arrays.asList("lungFunction-001"); + if (reportFlag.contains("_") && !ignoreUnderlineSenders.contains(sender)) { String[] split = reportFlag.split("_"); serialnum = split[0]; }