commit

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -782,14 +782,17 @@ public class MzPharmacyController {
             if (cfxxList.size() > 0) {
                 // 获取公共信息
                 MzVisitTable visit = mzVisitTableService.queryByPatientIdAndTimes(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes());
-                String icdText = StringUtils.isBlank(visit.getIcdText())?"":visit.getIcdText();
+                String icdText = "";
+                if (visit != null) {
+                    icdText = StringUtils.isBlank(visit.getIcdText())?"":visit.getIcdText();
+                }
                 MzBlRecord mzBlRecord = mzBlRecordService.queryMzBlRecordByPatientIdAndTimes(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes());
                 if(null != mzBlRecord && StringUtils.isNotBlank(mzBlRecord.getTentativeDiagnosis())){
                     icdText += (StringUtils.isBlank(icdText)?"":"，")+mzBlRecord.getTentativeDiagnosis();
                 }
                 String warnDeptName = zdUnitCodeService.queryDeptNameByIdInCache(cfxxList.get(0).getWarnDept());
                 Employee employee = employeeService.queryByUserCode(cfxxList.get(0).getDoctorCode());
-                String employeeName = employee.getEmployeeName();
+                String employeeName = employee != null ? employee.getEmployeeName() : "";
                 
                 // 获取患者信息，添加医保接口需要的三个参数
                 MzPatientMi patientInfo = null;
@@ -840,9 +843,11 @@ public class MzPharmacyController {
                 String ypUnitName = mzPharmacyService.getYpUnitName(mzSendMedicineVo.getYpUnit());
                 mzSendMedicineVo.setDrugUnitName(drugUnitName);
                 mzSendMedicineVo.setYpUnitName(ypUnitName);
-                if(mzSendMedicineVo.getSupplyCode() != null){
+                if(StringUtils.isNotBlank(mzSendMedicineVo.getSupplyCode())){
                     MzZdSupplyType mzZdSupplyType = mzZdSupplyTypeService.selectMzZdSupplyTypeByCode(mzSendMedicineVo.getSupplyCode());
-                    mzSendMedicineVo.setPrintName(mzZdSupplyType.getPrintName());
+                    if (mzZdSupplyType != null) {
+                        mzSendMedicineVo.setPrintName(mzZdSupplyType.getPrintName());
+                    }
                 }
                 
                 // 获取药品相关信息