优化

src/main/java/thyyxxk/webserver/service/casefrontsheet/VerifyCaseFrontSheet.java

@@ -330,9 +330,11 @@ public class VerifyCaseFrontSheet {
     }
 
     private List<CodeName> connectedVerify(List<CodeName> array, CaseFrontsheetMain info, Integer opType) {
-        if (info.getMarriage().equals("1") || info.getMarriage().equals("3") || info.getMarriage().equals("4")) {
-            if (info.getContactRelation().equals("1")) {
-                array.add(new CodeName("contactRelation", "当婚姻状况为未婚、丧偶、离婚时，患者联系人关系不允许为配偶！"));
+        if (StringUtil.notBlank(info.getMarriage())) {
+            if (info.getMarriage().equals("1") || info.getMarriage().equals("3") || info.getMarriage().equals("4")) {
+                if (info.getContactRelation().equals("1")) {
+                    array.add(new CodeName("contactRelation", "当婚姻状况为未婚、丧偶、离婚时，患者联系人关系不允许为配偶！"));
+                }
             }
         }
         if (StringUtil.notBlank(info.getZyDismissWay())) {
@@ -352,7 +354,7 @@ public class VerifyCaseFrontSheet {
                 }
             }
         }
-        if ("4".equals(info.getZyDismissWay())) {
+        if (StringUtil.notBlank(info.getZyDismissWay()) && "4".equals(info.getZyDismissWay())) {
             if (StringUtil.isBlank(info.getAutopsy())) {
                 array.add(new CodeName("autopsy", "离院方式为死亡时，尸检不能为空！"));
             }