浏览代码

防止空指针异常

hurugang 3 年之前
父节点
当前提交
0d5582d5c8
共有 1 个文件被更改,包括 11 次插入9 次删除
  1. 11 9
      src/main/java/cn/hnthyy/thmz/controller/mz/ClinicController.java

+ 11 - 9
src/main/java/cn/hnthyy/thmz/controller/mz/ClinicController.java

@@ -232,15 +232,17 @@ public class ClinicController {
                 List<TurnToConsultation> turnToConsultations = turnToConsultationService.queryUnConsultationByTargetDept(patientId, yjDeptCode, tokenUser.getUserIdCode());
                 if(turnToConsultations==null || turnToConsultations.size()==0){
                     MzfzPatientOrder mzfzPatientOrder= mzfzPatientOrderService.queryLastClinicedFzOrder(patientId);
-                    TurnToConsultation turnToConsultation=new TurnToConsultation();
-                    turnToConsultation.setPatientId(patientId);
-                    turnToConsultation.setSourceDeptNo(mzfzPatientOrder.getDeptCode());
-                    turnToConsultation.setSourceDoctorNo(mzfzPatientOrder.getDoctorCode());
-                    turnToConsultation.setTargetDeptNo(yjDeptCode);
-                    turnToConsultation.setSerialNo(mzfzPatientOrder.getSerialNo().toString());
-                    turnToConsultation.setRemark("医技科室接诊患者系统自动发起会诊申请");
-                    turnToConsultation.setOpType(TurnToConsultation.HZ);
-                    turnToConsultationService.save(turnToConsultation);
+                    if(mzfzPatientOrder!=null){
+                        TurnToConsultation turnToConsultation=new TurnToConsultation();
+                        turnToConsultation.setPatientId(patientId);
+                        turnToConsultation.setSourceDeptNo(mzfzPatientOrder.getDeptCode());
+                        turnToConsultation.setSourceDoctorNo(mzfzPatientOrder.getDoctorCode());
+                        turnToConsultation.setTargetDeptNo(yjDeptCode);
+                        turnToConsultation.setSerialNo(mzfzPatientOrder.getSerialNo().toString());
+                        turnToConsultation.setRemark("医技科室接诊患者系统自动发起会诊申请");
+                        turnToConsultation.setOpType(TurnToConsultation.HZ);
+                        turnToConsultationService.save(turnToConsultation);
+                    }
                 }
             }else {
                 data = mzfzPatientOrderService.queryByPatientId(patientId, tokenUser.getUserIdCode());