从病历获取的诊断和手术要进行非空校验

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

@@ -334,8 +334,10 @@ public class CaseFrontSheetMainService {
             for (int i = 0; i < diagList.size(); i++) {
                 JSONObject diagItem = diagList.getJSONObject(i);
                 CaseFrontsheetDisdiag diag = dao.selectDiagInfoByCode(diagItem.getString("code"));
-                diag.setNo(i + 1);
-                disdiags.add(diag);
+                if (null != diag) {
+                    diag.setNo(disdiags.size() + 1);
+                    disdiags.add(diag);
+                }
             }
         }
         while (disdiags.size() < 27) {
@@ -375,16 +377,19 @@ public class CaseFrontSheetMainService {
                 for (int j = 0; j < oprtNameVals.size(); j++) {
                     JSONObject oprtCodeName = oprtNameVals.getJSONObject(j);
                     CaseFrontsheetSurgery surgery = dao.selectSurgeryByCode(oprtCodeName.getString("code"));
-                    surgery.setDate(DateUtil.parse(opdate));
-                    surgery.setOperator(oprtor.getString("code"));
-                    surgery.setOperatorName(oprtor.getString("name"));
-                    surgery.setAssistantOne(assis1.getString("code"));
-                    surgery.setAssistantOneName(assis1.getString("name"));
-                    surgery.setAssistantTwo(assis2.getString("code"));
-                    surgery.setAssistantTwoName(assis2.getString("name"));
-                    surgery.setAnaesthesiaor(anstor.getString("code"));
-                    surgery.setAnaesthesiaorName(anstor.getString("name"));
-                    surgeries.add(surgery);
+                    if (null != surgery) {
+                        surgery.setNo(surgeries.size() + 1);
+                        surgery.setDate(DateUtil.parse(opdate));
+                        surgery.setOperator(oprtor.getString("code"));
+                        surgery.setOperatorName(oprtor.getString("name"));
+                        surgery.setAssistantOne(assis1.getString("code"));
+                        surgery.setAssistantOneName(assis1.getString("name"));
+                        surgery.setAssistantTwo(assis2.getString("code"));
+                        surgery.setAssistantTwoName(assis2.getString("name"));
+                        surgery.setAnaesthesiaor(anstor.getString("code"));
+                        surgery.setAnaesthesiaorName(anstor.getString("name"));
+                        surgeries.add(surgery);
+                    }
                 }
             }
         }