diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java index 0265692..9b811a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java @@ -114,18 +114,16 @@ public class QhdPuerService { Organization org = organizationService.getOrganization(Integer.parseInt( antExChuModel.getHospitalId())); model.put("buildHospital",org.getName()); model.put("isBuild","已建档"); - for (Patients patients : pats){ - if (patients.isSendCoupon() != null && patients.isSendCoupon()){ - model.put("isCoupon","已领取"); - break; - } - } - // String byUsedId = couponMapper.findByUsedId(pats.get(0).getPid()); // if (StringUtils.isNotEmpty(byUsedId)) { // model.put("isCoupon","已领取"); // } - + } + for (Patients patients : pats){ + if (patients.isSendCoupon() != null && patients.isSendCoupon()){ + model.put("isCoupon","已领取"); + break; + } } } model.put("PTN_NAME",rs.getString("PTN_NAME")); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 55d70d8..1c248a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -5470,8 +5470,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); String yyzyfmHospitalId_name = ""; for (Patients patient : patients) { - if (StringUtils.isNotEmpty(patient.getYyzyfmHospitalId()) && !"undifend".equals(patient.getYyzyfmHospitalId())) { - yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); + if (StringUtils.isNotEmpty(patient.getYyzyfmHospitalId()) && !"undefined".equals(patient.getYyzyfmHospitalId())) { + yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patient.getYyzyfmHospitalId()); map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); break;