jiangjiazhi / regional-platform

Download as
Browse Code »

Commit aa0ee3925202ba6e607022ef88077d130bc17284

Authored by Administrator
1 parent ddb5c510a1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 16 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java View file @ aa0ee39
1 1 package com.lyms.platform.operate.web.service.impl;
2 2  
3 3 import com.lyms.platform.biz.service.ApplyOrderService;
  4 +import com.lyms.platform.biz.service.BasicConfigService;
4 5 import com.lyms.platform.common.enums.YnEnums;
5 6 import com.lyms.platform.common.result.BaseObjectResponse;
6 7 import com.lyms.platform.common.result.PageResult;
... ... @@ -9,6 +10,7 @@
9 10 import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
10 11 import com.lyms.platform.operate.web.service.OrgCouponService;
11 12 import com.lyms.platform.operate.web.utils.CollectionUtils;
  13 +import com.lyms.platform.operate.web.utils.CommonsHelper;
12 14 import com.lyms.platform.operate.web.utils.PageUtil;
13 15 import com.lyms.platform.operate.web.utils.ResponseUtil;
14 16 import com.lyms.platform.permission.dao.master.CouponMapper;
... ... @@ -41,6 +43,9 @@
41 43 @Autowired
42 44 private ApplyOrderService applyOrderService;
43 45  
  46 + @Autowired
  47 + private BasicConfigService basicConfigService;
  48 +
44 49 /**
45 50 * 优惠券统计报表key（type + "_" + coupon_order）所对应的header名称
46 51 */
... ... @@ -418,6 +423,8 @@
418 423 cnames.put("doctorName", "使用医生");
419 424 cnames.put("send_hospital", "优惠券发放机构");
420 425 cnames.put("phone", "联系电话");
  426 + cnames.put("habitation", "常住地址");
  427 + cnames.put("cardNo", "身份证号码");
421 428  
422 429 List<Map<String, Object>> results = new ArrayList<>();
423 430 int i = 0;
... ... @@ -434,6 +441,8 @@
434 441 result.put("doctorName", m.get("doctorName"));
435 442 result.put("send_hospital", m.get("send_hospital"));
436 443 result.put("phone", m.get("phone"));
  444 + result.put("habitation", m.get("habitation"));
  445 + result.put("cardNo", m.get("cardNo"));
437 446 results.add(result);
438 447 }
439 448 ResponseUtil.responseExcel(cnames, results, response);
... ... @@ -446,6 +455,8 @@
446 455 String week = null; /** 产检孕周 = 产检时间 - 末次月经 */
447 456 Integer number = null; /** 产检第次 */
448 457 String phone = null; /** 联系电话 */
  458 + String cardNo = null;/**身份证号码*/
  459 + String habitation = null;/**居住地*/
449 460 if (map.get("used_hospital_id") != null) {
450 461 String operatorOrgName = couponMapper.findHospitalNameById(map.get("used_hospital_id").toString()); /** 使用机构 */
451 462 map.put("operatorOrgName", operatorOrgName);
... ... @@ -456,6 +467,9 @@
456 467 if (patients != null) {
457 468 checkDate = patients.getCreated();
458 469 username = patients.getUsername();
  470 + cardNo = patients.getCardNo();
  471 + habitation = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
  472 + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
459 473 week = DateUtil.getWeekDesc(patients.getLastMenses(), checkDate);
460 474 phone = patients.getPhone();
461 475 }
... ... @@ -602,6 +616,8 @@
602 616 map.put("number", number);
603 617 map.put("doctorName", doctorName);
604 618 map.put("phone", phone);
  619 + map.put("cardNo", cardNo);
  620 + map.put("habitation", habitation);
605 621 }
606 622  
607 623 private String findUserNameByPid(String pid) {