Merge remote-tracking branch 'origin/master'

src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java

@@ -205,7 +205,7 @@ public class HIP1008InspectionReportAdditionHandler implements WebserviceReceive
         String eafNo = eafNoNode.getNodeValue();
         String serialnum = reportFlag + "@" + eafNo;
         // 如果报告单号带下划线是合并报告，取报告单号下划线前的，可能有个别来源不需要
-        List<String> ignoreUnderlineSenders= Arrays.asList("lungFunction-001");
+        List<String> ignoreUnderlineSenders= Arrays.asList("lungFunction-001","BL-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

@@ -189,7 +189,7 @@ public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveS
         String eafNo = eafNoNode.getNodeValue();
         String serialnum = reportFlag + "@" + eafNo;
         // 如果报告单号带下划线是合并报告，取报告单号下划线前的，可能有个别来源不需要
-        List<String> ignoreUnderlineSenders= Arrays.asList("lungFunction-001");
+        List<String> ignoreUnderlineSenders= Arrays.asList("lungFunction-001","BL-001");
         if (reportFlag.contains("_") && !ignoreUnderlineSenders.contains(sender)) {
             String[] split = reportFlag.split("_");
             serialnum = split[0];