所有类型为手术的操作都要填写麻醉医师和麻醉方式

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

@@ -449,12 +449,20 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.isBlank(surgery.getName())) {
             return;
         }
-        if (StringUtil.notBlank(surgery.getAnaesthesia()) &&
-                !surgery.getAnaesthesia().equals("23") && !surgery.getAnaesthesia().equals("29")) {
-            if (StringUtil.isBlank(surgery.getAnaesthesiaorName())) {
-                array.add(new CodeName("surgeryTable", "手术" + surgery.getNo() + "，麻醉医师不能为空！"));
+        if (surgery.getType() == 1) {
+            if (StringUtil.isBlank(surgery.getAnaesthesia())) {
+                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，麻醉方式不能为空！"));
+            }
+            if (StringUtil.isBlank(surgery.getAnaesthesiaor())) {
+                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，麻醉医师不能为空！"));
             }
         }
+//        if (StringUtil.notBlank(surgery.getAnaesthesia()) &&
+//                !surgery.getAnaesthesia().equals("23") && !surgery.getAnaesthesia().equals("29")) {
+//            if (StringUtil.isBlank(surgery.getAnaesthesiaorName())) {
+//                array.add(new CodeName("surgeryTable", "手术" + surgery.getNo() + "，麻醉医师不能为空！"));
+//            }
+//        }
         if (StringUtil.isBlank(surgery.getOperator())) {
             array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，术者不能为空！"));
         }
@@ -468,12 +476,12 @@ public class VerifyCaseFrontSheet {
             if (StringUtil.isBlank(surgery.getCutHeal())) {
                 array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，三、四级手术切口愈合等级不能为空！"));
             }
-            if (StringUtil.isBlank(surgery.getAnaesthesia())) {
-                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，三、四级手术麻醉方式不能为空！"));
-            }
-            if (StringUtil.isBlank(surgery.getAnaesthesiaor())) {
-                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，三、四级手术麻醉医师不能为空！"));
-            }
+//            if (StringUtil.isBlank(surgery.getAnaesthesia())) {
+//                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，三、四级手术麻醉方式不能为空！"));
+//            }
+//            if (StringUtil.isBlank(surgery.getAnaesthesiaor())) {
+//                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，三、四级手术麻醉医师不能为空！"));
+//            }
             if (StringUtil.isBlank(surgery.getAssistantTwo())) {
                 array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "，三、四级手术II助不能为空！"));
             }