jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2eaf5a49be5d07636f5d697cd26deb5a363e0d89

Authored by zhangchao
1 parent 5714e075d2
Exists in dev

#fix:优化

Showing 5 changed files with 67 additions and 6 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java View file @ 2eaf5a4
... ... @@ -25,7 +25,7 @@
25 25  
26 26 FU_WU_DING_GOU_TX("Qnkzkq5gbmIK_kwWQ5y5DOxKywEA8lc7qQi6SMza0xU","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒
27 27 YI_SHENG_ZHI_DAO("Qnkzkq5gbmIK_kwWQ5y5DOxKywEA8lc7qQi6SMza0xU","医生指导"),//指导
28   -
  28 + YU_YUE_JIAN_DANG_TX("tx-UmDE3YMgYaAeFccXB7HITuG_tiP9LMdX2bvBpus","建档提醒"),//预约建档未审核提醒
29 29 // FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒
30 30 // YI_SHENG_ZHI_DAO("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","医生指导"),//指导
31 31  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ 2eaf5a4
... ... @@ -56,7 +56,7 @@
56 56 // if(isTest){
57 57 // return findNewTestSyncHighRisk();
58 58 // }
59   -
  59 + System.out.println("findNewHighRisk-> "+orgId);
60 60 if (CollectionUtils.isEmpty(mainBasicConfigList)) {
61 61 List<BasicConfig> basicConfigList = (List<BasicConfig>) RedisUtils.getObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT);
62 62  
... ... @@ -126,7 +126,7 @@
126 126 }
127 127 dispNewHighRisk(basicConfigList, mainBasicConfigList);
128 128 }
129   -
  129 + System.out.println("findNewHighRisk-> "+mainBasicConfigList);
130 130 BaseResponse baseResponse = new BaseResponse();
131 131 baseResponse.setObject(mainBasicConfigList);
132 132 return baseResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 2eaf5a4
... ... @@ -1408,6 +1408,68 @@
1408 1408 }
1409 1409 return "";
1410 1410 }
  1411 + private static final long TIMES = 24 * 60 * 60 * 1000 - 1;
  1412 + /**
  1413 + * 大同下午18点推送预建档未审核提醒
  1414 + */
  1415 + public void archiveServiceSync() {
  1416 + ArchiveDataQuery archiveDataQuery =new ArchiveDataQuery();
  1417 + archiveDataQuery.setHospitalId("2100002419");
  1418 + Date start = DateUtil.getYMDTime();
  1419 + Date end = new Date(start.getTime() + TIMES);
  1420 + archiveDataQuery.setCreatedStart(start);
  1421 + archiveDataQuery.setCreatedEnd(end);
  1422 + archiveDataQuery.setHasBuildDate(false);
  1423 + final List<ArchiveData> archiveDataList= archiveDataServicer.query(archiveDataQuery.convertToQuery());
  1424 +
  1425 + if (CollectionUtils.isNotEmpty(archiveDataList)){
  1426 + new Thread(new Runnable() {
  1427 + @Override
  1428 + public void run() {
  1429 + for (int i = 0, j = archiveDataList.size(); i < j; i++) {
  1430 + ArchiveData archiveData= archiveDataList.get(i);
  1431 + sendArchiveMsg(archiveData);
  1432 + }
  1433 + }
  1434 + }).start();
  1435 +
  1436 + }
  1437 +
  1438 + }
  1439 +
  1440 + public void sendArchiveMsg(ArchiveData archiveData){
  1441 + if ("2100002419".equals(archiveData.getHospitalId())){
  1442 + try {
  1443 + logger.info("sendArchiveMsg startup");
  1444 + List<MsgRequest> messages = new ArrayList<>();
  1445 + MsgRequest mr = new MsgRequest();
  1446 + mr.setPhone(archiveData.getPhone());
  1447 + mr.setMemberId(null);
  1448 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
  1449 + mr.setStatus(SmsStatusEnums.WFS.getId());
  1450 + mr.setHospitalId(archiveData.getHospitalId());
  1451 + mr.setTempId("657ad0e90cf25d442e62df56");
  1452 + mr.setPatientId(null);
  1453 + mr.setSmsStatus(SmsStatusEnums.WFS.getId());
  1454 + mr.setServiceType(1); //判断发送类型
  1455 + mr.setFirst("【建档提醒】");//
  1456 + mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
  1457 + mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
  1458 + mr.setKeyword1("大同市第一人民医院");//
  1459 + //planTime 和 timeType为必填 否则推送中心会推送异常
  1460 + mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
  1461 + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
  1462 + mr.setKeyword2("请前往产科门诊二楼产科网络部进行档案确认");
  1463 + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
  1464 + mr.setWxTempId(WxTempleteIdEnums.YU_YUE_JIAN_DANG_TX.getId());
  1465 + messages.add(mr);
  1466 + smsConfigFacade.saveMsg(messages, archiveData.getHospitalId());
  1467 + } catch (Exception e) {
  1468 + logger.error("sendArchiveMsg Exception " + e);
  1469 + }
  1470 + }
  1471 + }
  1472 +
1411 1473  
1412 1474 /**
1413 1475 * 大同服务内容提醒 上午9点推送
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java View file @ 2eaf5a4
... ... @@ -710,9 +710,9 @@
710 710 CourseModel courseModel = new CourseModel();
711 711 courseModel.setId(courseId);
712 712 if (type!=null&&type==2){
713   - courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1);
  713 + courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1 >0 ? courseModels.get(0).getEnrolmentUnderNum() - 1 : 0);
714 714 }else {
715   - courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1);
  715 + courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1 >0 ? courseModels.get(0).getEnrolmentNum() - 1 : 0);
716 716 }
717 717 courseService.updateCourse(courseModel);
718 718 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 2eaf5a4
... ... @@ -603,7 +603,6 @@
603 603  
604 604 //大同医院服务推送\短信
605 605 public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1, Integer objType, Integer type) {
606   - System.out.println("333333333333333333333");
607 606 if ("2100002419".equals(patient.getHospitalId())) {
608 607 try {
609 608 //Thread.sleep(5000);