From 794a65f3e32d52589754cd60230a3f7739333e30 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 21 Jun 2022 15:42:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E5=A6=87=E5=B9=BC-=E5=BB=BA=E6=A1=A3=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E7=BB=9F=E8=AE=A1=E5=8A=A02=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=88=E9=A6=96=E6=AC=A1=E5=BB=BA=E6=A1=A3=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=EF=BC=8C=E5=AE=9E=E9=99=85=E5=88=86=E5=A8=A9=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/ReportServiceImpl.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) 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 abb4314..70d9765 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.lyms.hospitalapi.pojo.ReportModel; import com.lyms.platform.biz.AntExChuModelTemp; +import com.lyms.platform.biz.dal.IAntExChuDao; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -115,6 +116,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Autowired private PersonService personService; + @Autowired + private IAntExChuDao iAntExChuDao; + private static final Map colorMap = new HashMap<>(); @@ -5459,6 +5463,20 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); + //初诊医院 + String firstVisitHospital=""; + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(patientsModel.getId()); + List antExChuModels = iAntExChuDao.query(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created")); + if(CollectionUtils.isNotEmpty(antExChuModels)){ + firstVisitHospital = couponMapper.findHospitalNameById(antExChuModels.get(0).getHospitalId()); + } + map.put("firstVisitHospital", firstVisitHospital); + //分娩医院 + String fmHospital = couponMapper.findHospitalNameById(patientsModel.getFmHospital()); + map.put("fmHospital", StringUtils.isNotEmpty(fmHospital)?fmHospital:""); + map.put("created", bookbuildingCoupon.get("created")); result.add(map); @@ -5487,6 +5505,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService resultMap.put("created", map.get("created")); //建档时间 resultMap.put("hospitalName", map.get("hospitalName")); //建档社区医院 resultMap.put("yyzyfmHospitalId", map.get("yyzyfmHospitalId")); //预约分娩医院 + resultMap.put("firstVisitHospital", map.get("firstVisitHospital")); //初诊医院 + resultMap.put("fmHospital", map.get("fmHospital")); //分娩医院 results.add(resultMap); } @@ -5498,6 +5518,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService cnames.put("created", "建档时间"); //建档时间 cnames.put("hospitalName", "建档社区医院"); //建档社区医院 cnames.put("yyzyfmHospitalId", "预约分娩医院"); //预约分娩医院 + cnames.put("firstVisitHospital","首次医学建档医院"); //初诊医院 + cnames.put("fmHospital", "实际分娩医院"); //分娩医院 ResponseUtil.responseExcel(cnames, results, httpServletResponse); } -- 1.8.3.1