注射卡诊断处理

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

@@ -894,7 +894,12 @@ public class MzPharmacyController {
             List<MzSendMedicineVo> cfxxList = mzPharmacyService.getFyclPrescriptionDetail(mzChargeDetail);
             if (cfxxList.size() > 0) {
                 MzVisitTable visit = mzVisitTableService.queryByPatientIdAndTimes(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes());
-                cfxxList.get(0).setIcdText(visit.getIcdText());
+                if(StringUtils.isBlank(visit.getIcdText())){
+                    MzBlRecord mzBlRecord = mzBlRecordService.queryMzBlRecordByPatientIdAndTimes(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes());
+                    cfxxList.get(0).setIcdText(mzBlRecord.getTentativeDiagnosis());
+                }else{
+                    cfxxList.get(0).setIcdText(visit.getIcdText());
+                }
                 String warnDeptName = zdUnitCodeService.queryDeptNameByIdInCache(cfxxList.get(0).getWarnDept());
                 cfxxList.get(0).setWarnDeptName(warnDeptName);
                 Employee employee = employeeService.queryByUserCode(cfxxList.get(0).getDoctorCode());