Explorar el Código

术后24小时内无主刀或一助查房记录修改空指针

huj hace 4 años
padre
commit
4b4c47a3f9

+ 5 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02900.java

@@ -31,11 +31,9 @@ public class THR02900 extends QCCatalogue {
             return;
         }
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        ThreeLevelWardDoc threeLevelWardDoc = new ThreeLevelWardDoc();
         List<ThreeLevelWardDoc> allDoctorWradDocs = new ArrayList<>();
-        if(inputInfo.getThreeLevelWardDocs() != null){
-            threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
-            threeLevelWardDoc.getAllDoctorWradDocs();
+        if (inputInfo.getThreeLevelWardDocs() != null && inputInfo.getThreeLevelWardDocs().size() > 0) {
+            allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
         }
         String allTitle = "";
         for (OperationDoc operationDoc : operationDocs) {
@@ -56,13 +54,13 @@ public class THR02900 extends QCCatalogue {
                     StringUtil.parseDateTime(DateUtil.nowString()),
                     Long.valueOf(24 * 60))) {//如果接收未超过6小时,规则不判断
                 return;
-            }else {
-                if((StringUtil.isNotEmpty(chiefSurgeon) || StringUtil.isNotEmpty(firstAssistant)) && ListUtil.isEmpty(allDoctorWradDocs)) {
+            } else {
+                if ((StringUtil.isNotEmpty(chiefSurgeon) || StringUtil.isNotEmpty(firstAssistant)) && ListUtil.isEmpty(allDoctorWradDocs)) {
                     status.set("-1");
                     return;
                 }
             }
-            if(ListUtil.isNotEmpty(allDoctorWradDocs)){
+            if (ListUtil.isNotEmpty(allDoctorWradDocs)) {
                 for (ThreeLevelWardDoc wardDoc : allDoctorWradDocs) {
                     Map<String, String> wardStructureMap = wardDoc.getStructureMap();
                     String recordDateStr = wardStructureMap.get("查房日期");