出院结算时加强非空校验

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>1</version>
+    <version>2</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -123,6 +123,41 @@ public class DismissService {
                 throw new BizException(exception);
             }
         }
+        if (StringUtil.isBlank(param.getDutyNurse())) {
+            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+            exception.setMessage("患者责任护士不能为空，请前往入院登记页面填写并保存。");
+            throw new BizException(exception);
+        }
+        if (StringUtil.isBlank(param.getCountry())) {
+            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+            exception.setMessage("患者国籍不能为空，请前往入院登记页面填写并保存。");
+            throw new BizException(exception);
+        }
+        if (StringUtil.isBlank(param.getNation())) {
+            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+            exception.setMessage("患者民族不能为空，请前往入院登记页面填写并保存。");
+            throw new BizException(exception);
+        }
+        if (StringUtil.isBlank(param.getContactName())) {
+            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+            exception.setMessage("患者联系人不能为空，请前往入院登记页面填写并保存。");
+            throw new BizException(exception);
+        }
+        if (StringUtil.isBlank(param.getContactRelation())) {
+            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+            exception.setMessage("患者联系人关系不能为空，请前往入院登记页面填写并保存。");
+            throw new BizException(exception);
+        }
+        if (StringUtil.isBlank(param.getContactAddrName())) {
+            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+            exception.setMessage("患者联系人地址不能为空，请前往入院登记页面填写并保存。");
+            throw new BizException(exception);
+        }
+        if (StringUtil.isBlank(param.getContactPhone())) {
+            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+            exception.setMessage("患者联系人电话不能为空，请前往入院登记页面填写并保存。");
+            throw new BizException(exception);
+        }
         if (null == param.getAdmissDate()) {
             ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
             exception.setMessage("没有找到入院时间，请重新获取病人信息。");

src/main/java/thyyxxk/webserver/service/yibao/PatientService.java

@@ -177,7 +177,6 @@ public class PatientService {
         if (null == medType) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择患者的医疗类别！");
         }
-
         if (StringUtil.isBlank(patient.getDutyNurse())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "责任护士不能为空！");
         }