Commit 794a65f3e32d52589754cd60230a3f7739333e30
1 parent
185926f1a4
Exists in
master
and in
6 other branches
秦皇岛-区域妇幼-建档优惠券统计加2个字段（首次建档医院，实际分娩医院）
Showing 1 changed file with 22 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
794a65f
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | 5 | import com.lyms.hospitalapi.pojo.ReportModel; |
| 6 | 6 | import com.lyms.platform.biz.AntExChuModelTemp; |
| 7 | +import com.lyms.platform.biz.dal.IAntExChuDao; | |
| 7 | 8 | import com.lyms.platform.biz.service.*; |
| 8 | 9 | import com.lyms.platform.common.base.PageInfo; |
| 9 | 10 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 10 | 11 | |
| ... | ... | @@ -115,7 +116,10 @@ |
| 115 | 116 | @Autowired |
| 116 | 117 | private PersonService personService; |
| 117 | 118 | |
| 119 | + @Autowired | |
| 120 | + private IAntExChuDao iAntExChuDao; | |
| 118 | 121 | |
| 122 | + | |
| 119 | 123 | private static final Map<String, String> colorMap = new HashMap<>(); |
| 120 | 124 | |
| 121 | 125 | /** |
| ... | ... | @@ -5459,6 +5463,20 @@ |
| 5459 | 5463 | map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); |
| 5460 | 5464 | String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); |
| 5461 | 5465 | map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); |
| 5466 | + //初诊医院 | |
| 5467 | + String firstVisitHospital=""; | |
| 5468 | + AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 5469 | + antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 5470 | + antExChuQuery.setParentId(patientsModel.getId()); | |
| 5471 | + List<AntExChuModel> antExChuModels = iAntExChuDao.query(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created")); | |
| 5472 | + if(CollectionUtils.isNotEmpty(antExChuModels)){ | |
| 5473 | + firstVisitHospital = couponMapper.findHospitalNameById(antExChuModels.get(0).getHospitalId()); | |
| 5474 | + } | |
| 5475 | + map.put("firstVisitHospital", firstVisitHospital); | |
| 5476 | + //分娩医院 | |
| 5477 | + String fmHospital = couponMapper.findHospitalNameById(patientsModel.getFmHospital()); | |
| 5478 | + map.put("fmHospital", StringUtils.isNotEmpty(fmHospital)?fmHospital:""); | |
| 5479 | + | |
| 5462 | 5480 | map.put("created", bookbuildingCoupon.get("created")); |
| 5463 | 5481 | |
| 5464 | 5482 | result.add(map); |
| ... | ... | @@ -5487,6 +5505,8 @@ |
| 5487 | 5505 | resultMap.put("created", map.get("created")); //建档时间 |
| 5488 | 5506 | resultMap.put("hospitalName", map.get("hospitalName")); //建档社区医院 |
| 5489 | 5507 | resultMap.put("yyzyfmHospitalId", map.get("yyzyfmHospitalId")); //预约分娩医院 |
| 5508 | + resultMap.put("firstVisitHospital", map.get("firstVisitHospital")); //初诊医院 | |
| 5509 | + resultMap.put("fmHospital", map.get("fmHospital")); //分娩医院 | |
| 5490 | 5510 | results.add(resultMap); |
| 5491 | 5511 | } |
| 5492 | 5512 | |
| ... | ... | @@ -5498,6 +5518,8 @@ |
| 5498 | 5518 | cnames.put("created", "建档时间"); //建档时间 |
| 5499 | 5519 | cnames.put("hospitalName", "建档社区医院"); //建档社区医院 |
| 5500 | 5520 | cnames.put("yyzyfmHospitalId", "预约分娩医院"); //预约分娩医院 |
| 5521 | + cnames.put("firstVisitHospital","首次医学建档医院"); //初诊医院 | |
| 5522 | + cnames.put("fmHospital", "实际分娩医院"); //分娩医院 | |
| 5501 | 5523 | |
| 5502 | 5524 | ResponseUtil.responseExcel(cnames, results, httpServletResponse); |
| 5503 | 5525 | } |