Commit e05a02130fcd5f2662f1807a5668ecf869b15312

Authored by liquanyu
1 parent 5321b95f57

筛查

Showing 2 changed files with 8 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java View file @ e05a021
... ... @@ -114,18 +114,16 @@
114 114 Organization org = organizationService.getOrganization(Integer.parseInt( antExChuModel.getHospitalId()));
115 115 model.put("buildHospital",org.getName());
116 116 model.put("isBuild","已建档");
117   - for (Patients patients : pats){
118   - if (patients.isSendCoupon() != null && patients.isSendCoupon()){
119   - model.put("isCoupon","已领取");
120   - break;
121   - }
122   - }
123   -
124 117 // String byUsedId = couponMapper.findByUsedId(pats.get(0).getPid());
125 118 // if (StringUtils.isNotEmpty(byUsedId)) {
126 119 // model.put("isCoupon","已领取");
127 120 // }
128   -
  121 + }
  122 + for (Patients patients : pats){
  123 + if (patients.isSendCoupon() != null && patients.isSendCoupon()){
  124 + model.put("isCoupon","已领取");
  125 + break;
  126 + }
129 127 }
130 128 }
131 129 model.put("PTN_NAME",rs.getString("PTN_NAME"));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ e05a021
... ... @@ -5470,8 +5470,8 @@
5470 5470 map.put("hospitalName", bookbuildingCoupon.get("hospitalname"));
5471 5471 String yyzyfmHospitalId_name = "";
5472 5472 for (Patients patient : patients) {
5473   - if (StringUtils.isNotEmpty(patient.getYyzyfmHospitalId()) && !"undifend".equals(patient.getYyzyfmHospitalId())) {
5474   - yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId());
  5473 + if (StringUtils.isNotEmpty(patient.getYyzyfmHospitalId()) && !"undefined".equals(patient.getYyzyfmHospitalId())) {
  5474 + yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patient.getYyzyfmHospitalId());
5475 5475  
5476 5476 map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:"");
5477 5477 break;