From 033dc11ce6f84ce1959ea15bf3bdf38c8be383b6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 2 Nov 2018 15:44:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E4=BC=98=E6=83=A0=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/ReportServiceImpl.java | 21 +++++++++++++++++++++ 1 file changed, 21 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 3a66de0..eee0053 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.lyms.hospitalapi.pojo.ReportModel; +import com.lyms.platform.biz.service.ApplyOrderService; import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.biz.service.PatientWeightService2; import com.lyms.platform.common.enums.*; @@ -28,6 +29,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; +import com.lyms.platform.query.SieveApplyOrderQuery; import com.lymsh.platform.reportdata.model.echarts.Series; import org.apache.commons.collections.*; import org.apache.commons.lang.StringUtils; @@ -65,6 +67,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Autowired AutoMatchFacade autoMatchFacade; + + @Autowired + private ApplyOrderService applyOrderService; @Autowired private CouponMapper couponMapper; @@ -3214,8 +3219,24 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService phone = findPhoneByPid(babyModel.getPid()); } } + } else if (type == 11) + { + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setId(usedId); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + //先查询本院是否已申请 + List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + usedId = CollectionUtils.isNotEmpty(list1) ? list1.get(0).getParentId() : usedId; + Patients patients = mongoTemplate.findById(usedId, Patients.class); + if(patients != null) { + checkDate = patients.getCreated(); + username = patients.getUsername(); + week = DateUtil.getWeekDesc(patients.getLastMenses(), checkDate); + phone = patients.getPhone(); + } } + map.put("checkDate", checkDate == null ? null : DateUtil.getyyyy_MM_dd(checkDate)); map.put("username", username); map.put("week", week); -- 1.8.3.1