Merge remote-tracking branch 'origin/master'

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)
@@ -60,10 +61,12 @@ public class HIP1010LaboratoryReportAdditionHandler implements WebserviceReceive
         }
 
         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");

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)
@@ -60,10 +61,12 @@ public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveS
         }
 
         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");
@@ -182,5 +185,4 @@ public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveS
     }
 
 
-
 }