‘chenzhilei’ 5 giorni fa
parent
commit
6781a375a3

+ 21 - 21
src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/VerifyCaseFrontSheet.java

@@ -514,31 +514,31 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.isBlank(surgery.getName())) {
             return;
         }
-        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 (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.isBlank(surgery.getOperator())) {
             array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",术者不能为空!"));
         }
-        if (surgery.getType() < 3 && StringUtil.isBlank(surgery.getLevel())) {
-            array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "手术操作编码为介入治疗或手术时,手术级别不能为空!"));
-        }
-        if (isHighLevelSurgery(surgery.getLevel())) {
-            if (StringUtil.isBlank(surgery.getAssistantOne())) {
-                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",三、四级手术I助不能为空!"));
-            }
-            if (StringUtil.isBlank(surgery.getCutHeal())) {
-                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",三、四级手术切口愈合等级不能为空!"));
-            }
-//            if (StringUtil.isBlank(surgery.getAssistantTwo())) {
-//                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",三、四级手术II助不能为空!"));
+//        if (surgery.getType() < 3 && StringUtil.isBlank(surgery.getLevel())) {
+//            array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + "手术操作编码为介入治疗或手术时,手术级别不能为空!"));
+//        }
+//        if (isHighLevelSurgery(surgery.getLevel())) {
+//            if (StringUtil.isBlank(surgery.getAssistantOne())) {
+//                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",三、四级手术I助不能为空!"));
 //            }
-        }
+//            if (StringUtil.isBlank(surgery.getCutHeal())) {
+//                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",三、四级手术切口愈合等级不能为空!"));
+//            }
+////            if (StringUtil.isBlank(surgery.getAssistantTwo())) {
+////                array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",三、四级手术II助不能为空!"));
+////            }
+//        }
         if (needAnstTimeButNotPresent(surgery)) {
             array.add(new CodeName("surgeryTable","手术" + surgery.getNo() + ",麻醉开始时间和结束时间不能为空!"));
         }