feat:顺德人医lungFunction-001 肺功能暂时走pacs，但是下划线不是合并

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<String> ignoreUnderlineSenders= Arrays.asList("lungFunction-001");
+        if (reportFlag.contains("_") && !ignoreUnderlineSenders.contains(sender)) {
             String[] split = reportFlag.split("_");
             serialnum = split[0];
         }

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<String> ignoreUnderlineSenders= Arrays.asList("lungFunction-001");
+        if (reportFlag.contains("_") && !ignoreUnderlineSenders.contains(sender)) {
             String[] split = reportFlag.split("_");
             serialnum = split[0];
         }