From aa0ee3925202ba6e607022ef88077d130bc17284 Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Fri, 27 Sep 2019 17:43:22 +0800 Subject: [PATCH] update --- .../operate/web/service/impl/OrgCouponServiceImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java index a3348f5..7661a44 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.ApplyOrderService; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.PageResult; @@ -9,6 +10,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.service.OrgCouponService; import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.PageUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.dao.master.CouponMapper; @@ -41,6 +43,9 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe @Autowired private ApplyOrderService applyOrderService; + @Autowired + private BasicConfigService basicConfigService; + /** * 优惠券统计报表key（type + "_" + coupon_order）所对应的header名称 */ @@ -418,6 +423,8 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe cnames.put("doctorName", "使用医生"); cnames.put("send_hospital", "优惠券发放机构"); cnames.put("phone", "联系电话"); + cnames.put("habitation", "常住地址"); + cnames.put("cardNo", "身份证号码"); List> results = new ArrayList<>(); int i = 0; @@ -434,6 +441,8 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe result.put("doctorName", m.get("doctorName")); result.put("send_hospital", m.get("send_hospital")); result.put("phone", m.get("phone")); + result.put("habitation", m.get("habitation")); + result.put("cardNo", m.get("cardNo")); results.add(result); } ResponseUtil.responseExcel(cnames, results, response); @@ -446,6 +455,8 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe String week = null; /** 产检孕周 = 产检时间 - 末次月经 */ Integer number = null; /** 产检第次 */ String phone = null; /** 联系电话 */ + String cardNo = null;/**身份证号码*/ + String habitation = null;/**居住地*/ if (map.get("used_hospital_id") != null) { String operatorOrgName = couponMapper.findHospitalNameById(map.get("used_hospital_id").toString()); /** 使用机构 */ map.put("operatorOrgName", operatorOrgName); @@ -456,6 +467,9 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe if (patients != null) { checkDate = patients.getCreated(); username = patients.getUsername(); + cardNo = patients.getCardNo(); + habitation = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); week = DateUtil.getWeekDesc(patients.getLastMenses(), checkDate); phone = patients.getPhone(); } @@ -602,6 +616,8 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe map.put("number", number); map.put("doctorName", doctorName); map.put("phone", phone); + map.put("cardNo", cardNo); + map.put("habitation", habitation); } private String findUserNameByPid(String pid) { -- 1.8.3.1