jiangjiazhi / regional-platform

Download as
Browse Code »

Commit cd3ae8733468fb9a148385170ec447565810c7c7

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

update

Showing 4 changed files with 16 additions and 88 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java View file @ cd3ae87
... ... @@ -18,7 +18,6 @@
18 18 BaseObjectResponse distErrorData();
19 19  
20 20 BaseObjectResponse validate(String code, Integer type, String hospitalId);
21   - BaseObjectResponse validate1(String code, Integer type, String hospitalId);
22 21  
23 22 BaseObjectResponse findList(String userId, String hospitalId, String url,Integer type);
24 23  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ cd3ae87
... ... @@ -469,65 +469,6 @@
469 469 return RespBuilder.buildSuccess(patientsInfo);
470 470 }
471 471  
472   -
473   -
474   - @Override
475   - public BaseObjectResponse validate1(String code, Integer type, String hospitalId) {
476   - Map<String, Object> param = new HashMap<>();
477   - param.put("code", code);
478   - param.put("type", type);
479   - List<CouponInfo> couponInfos = couponMapper.findList(param);
480   - if (CollectionUtils.isEmpty(couponInfos))
481   - return RespBuilder.buildErro(ResponseCode.COUPON_NOT_FOUND);
482   - if (couponInfos.size() > 1)
483   - return RespBuilder.buildErro(ResponseCode.COUPON_NOT_UNIQUE);
484   -
485   - CouponInfo couponInfo = couponInfos.get(0);
486   - Map<String, Object> patientsInfo = getPatientsInfo(couponInfo.getUserId());
487   -
488   - if (couponInfo.getStatus() == 3) {
489   - return RespBuilder.buildErro(ResponseCode.COUPON_IS_INVALID, patientsInfo);
490   - }
491   - if (couponInfo.getStatus() == -1) {
492   - return RespBuilder.buildErro(ResponseCode.COUPON_IS_DISABLED, patientsInfo);
493   - }
494   - if (couponInfo.getStatus() == 2) {
495   - patientsInfo.put("status",2);
496   - }
497   - else
498   - {
499   - patientsInfo.put("status",1);
500   - }
501   -
502   - Map<String, Object> data = couponMapper.findValidateParam(param);
503   - if (MapUtils.isEmpty(data)) {
504   - return RespBuilder.buildErro(ResponseCode.COUPON_NOT_AVAILABLE, patientsInfo);
505   - }
506   -
507   - PersonModel person = mongoTemplate.findById(couponInfo.getUserId(), PersonModel.class);
508   -
509   - /** 验证时间 */
510   - if (!validateDate(couponInfo.getUserId(), Integer.parseInt(data.get("actual_start").toString()), Integer.parseInt(data.get("actual_end").toString()), Integer.parseInt(data.get("unit_type").toString()),
511   - data.get("create_hospital_id").toString(), Integer.parseInt(data.get("type").toString()), 2, person.getType()))
512   - return RespBuilder.buildErro(ResponseCode.COUPON_TIME_OUT, patientsInfo);
513   -
514   - /** 验证区域 */
515   - if (!validateArea(data.get("area_type").toString(), couponInfo.getCreateHospitalId(), hospitalId)) {
516   - return RespBuilder.buildErro(ResponseCode.COUPON_AREA_NO_USE, patientsInfo);
517   - }
518   -
519   -// //验证优惠劵是否临时使用了 该功能属于秦皇岛区域
520   -// if (couponInfo.getTempStatus() != null && couponInfo.getTempStatus() == 1) {
521   -// //验证临时使用的医院是不是当前登陆的医院
522   -// if (StringUtils.isNotEmpty(couponInfo.getTempHospitalId()) && !couponInfo.getTempHospitalId().equals(hospitalId)) {
523   -// return RespBuilder.buildErro(ResponseCode.COUPON_IS_USED);
524   -// }
525   -// }
526   -
527   -
528   - return RespBuilder.buildSuccess(patientsInfo);
529   - }
530   -
531 472 @Override
532 473 public BaseObjectResponse validateUse(String code, Integer type, String hospitalId) {
533 474 Map<String, Object> param = new HashMap<>();
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ cd3ae87
... ... @@ -627,7 +627,7 @@
627 627 String itemName = "儿童保健";
628 628 String nextCheckTime = DateUtils.getDateStr(orderDate, DateUtils.Y_M_D);
629 629  
630   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
  630 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(),
631 631 ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
632 632 model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "",
633 633 WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
... ... @@ -720,7 +720,7 @@
720 720 //疫苗接种人
721 721 String vaccinePerson = model.getName();
722 722  
723   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
  723 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(),
724 724 ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
725 725 model.getHospitalId(), template.getId(), model.getId(), vaccineName, vaccinePerson, vaccineTime,
726 726 WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(), service);
... ... @@ -770,7 +770,7 @@
770 770 String itemName = "儿童保健";
771 771 String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄");
772 772  
773   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
  773 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(),
774 774 ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
775 775 model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "",
776 776 WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
... ... @@ -820,7 +820,7 @@
820 820 String itemName = "儿童保健";
821 821 String nextCheckTime = HelperUtils.getKeyword(start, end, "天");
822 822  
823   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
  823 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(),
824 824 ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
825 825 model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc,
826 826 WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
... ... @@ -870,7 +870,7 @@
870 870 String itemName = "儿童保健";
871 871 String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D);
872 872  
873   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
  873 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(),
874 874 ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
875 875 model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc,
876 876 WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
... ... @@ -1031,6 +1031,9 @@
1031 1031 } else {
1032 1032 if (serviceType == ServiceTypeEnums.NO_SERVICE.getId() && serviceStatus == ServiceStatusEnums.NO_SERVICE.getId()) {
1033 1033 // 无服务产检程序提醒
  1034 + // 服务类型和服务状态都为全部时
  1035 + patientsQuery.setLastMensesStart(startDate);
  1036 + patientsQuery.setLastMensesEnd(endDate);
1034 1037 patientsQuery.setServiceTypeIsExist(false);
1035 1038 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
1036 1039 for (Patients patient : patients) {
... ... @@ -1373,7 +1376,7 @@
1373 1376 }
1374 1377 String messagePrefix = baseService.getSmsPrefix(config, p.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId());
1375 1378 String messageContent = "【" + messagePrefix + "】" + template.getContent();
1376   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getPhone(),
  1379 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, p.getPhone(),
1377 1380 ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1378 1381 p.getHospitalId(), template.getId(), p.getId(),
1379 1382 //checkName, checkTimeStr, serDoct,
... ... @@ -1401,7 +1404,7 @@
1401 1404 }
1402 1405 String messagePrefix = baseService.getSmsPrefix(config, p.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId());
1403 1406 String messageContent = "【" + messagePrefix + "】" + template.getContent();
1404   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getMphone(),
  1407 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, p.getMphone(),
1405 1408 ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
1406 1409 p.getHospitalId(), template.getId(), p.getId(),
1407 1410 //checkName, checkTimeStr, serDoct,
1408 1411  
... ... @@ -1478,10 +1481,10 @@
1478 1481 String checkName = "产前检查";
1479 1482  
1480 1483  
1481   - String serDoct = baseService.getServiceDoctorId(pat.getId(),false);
  1484 + String serDoct = baseService.getServiceDoctorId(pat.getId(), false);
1482 1485  
1483 1486  
1484   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
  1487 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(),
1485 1488 ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1486 1489 pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct,
1487 1490 WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service);
... ... @@ -1551,7 +1554,7 @@
1551 1554  
1552 1555 messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent);
1553 1556  
1554   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
  1557 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(),
1555 1558 ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1556 1559 pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkWeekName, serDoct,
1557 1560 WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service);
... ... @@ -1588,7 +1591,7 @@
1588 1591 String checkTimeStr = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D);
1589 1592 String checkName = "产前检查";
1590 1593  
1591   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
  1594 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(),
1592 1595 ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1593 1596 pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct,
1594 1597 WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service);
... ... @@ -1699,7 +1702,7 @@
1699 1702 String messageContent = "【" + messagePrefix + "】" + template.getContent();
1700 1703 String title = "产后复查";
1701 1704 messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent);
1702   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
  1705 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(),
1703 1706 ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),
1704 1707 pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate, DateUtils.Y_M_D), "",
1705 1708 WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service);
... ... @@ -1811,7 +1814,7 @@
1811 1814 String days = "产后" + HelperUtils.getKeyword(start, end, "天");
1812 1815  
1813 1816 String title = "产后复查";
1814   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
  1817 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(),
1815 1818 ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),
1816 1819 pat.getHospitalId(), template.getId(), pat.getId(), title, days, "",
1817 1820 WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java View file @ cd3ae87
... ... @@ -114,21 +114,6 @@
114 114 }
115 115  
116 116  
117   -
118   - @RequestMapping(method = RequestMethod.GET, value = "/validate1/{code}/{type}")
119   - @ResponseBody
120   - @TokenRequired
121   - public BaseObjectResponse validate1(@PathVariable String code, @PathVariable Integer type, String userId, HttpServletRequest request) {
122   - if(StringUtils.isNotEmpty(userId)) {
123   - if(!couponService.validateUser(userId, code)) { /** 优惠券不属于本人 */
124   - return RespBuilder.buildErro(ResponseCode.COUPON_IS_NOT_SELF);
125   - }
126   - }
127   - return couponService.validate1(code, type, autoMatchFacade.getHospitalId(getUserId(request)));
128   - }
129   -
130   -
131   -
132 117 /**
133 118 * 获取当前登陆医生所属医院的所有人员
134 119 * @param request