diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java index 8320edb..21107f4 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java @@ -25,7 +25,7 @@ public enum WxTempleteIdEnums { FU_WU_DING_GOU_TX("Qnkzkq5gbmIK_kwWQ5y5DOxKywEA8lc7qQi6SMza0xU","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒 YI_SHENG_ZHI_DAO("Qnkzkq5gbmIK_kwWQ5y5DOxKywEA8lc7qQi6SMza0xU","医生指导"),//指导 - + YU_YUE_JIAN_DANG_TX("tx-UmDE3YMgYaAeFccXB7HITuG_tiP9LMdX2bvBpus","建档提醒"),//预约建档未审核提醒 // FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒 // YI_SHENG_ZHI_DAO("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","医生指导"),//指导 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index bf382a0..ad648bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -56,7 +56,7 @@ public class BasicConfigFacade { // if(isTest){ // return findNewTestSyncHighRisk(); // } - + System.out.println("findNewHighRisk-> "+orgId); if (CollectionUtils.isEmpty(mainBasicConfigList)) { List basicConfigList = (List) RedisUtils.getObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT); @@ -126,7 +126,7 @@ public class BasicConfigFacade { } dispNewHighRisk(basicConfigList, mainBasicConfigList); } - + System.out.println("findNewHighRisk-> "+mainBasicConfigList); BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(mainBasicConfigList); return baseResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 16a398a..d0e458f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1408,6 +1408,68 @@ public class BookbuildingFacade { } return ""; } + private static final long TIMES = 24 * 60 * 60 * 1000 - 1; + /** + * 大同下午18点推送预建档未审核提醒 + */ + public void archiveServiceSync() { + ArchiveDataQuery archiveDataQuery =new ArchiveDataQuery(); + archiveDataQuery.setHospitalId("2100002419"); + Date start = DateUtil.getYMDTime(); + Date end = new Date(start.getTime() + TIMES); + archiveDataQuery.setCreatedStart(start); + archiveDataQuery.setCreatedEnd(end); + archiveDataQuery.setHasBuildDate(false); + final List archiveDataList= archiveDataServicer.query(archiveDataQuery.convertToQuery()); + + if (CollectionUtils.isNotEmpty(archiveDataList)){ + new Thread(new Runnable() { + @Override + public void run() { + for (int i = 0, j = archiveDataList.size(); i < j; i++) { + ArchiveData archiveData= archiveDataList.get(i); + sendArchiveMsg(archiveData); + } + } + }).start(); + + } + + } + + public void sendArchiveMsg(ArchiveData archiveData){ + if ("2100002419".equals(archiveData.getHospitalId())){ + try { + logger.info("sendArchiveMsg startup"); + List messages = new ArrayList<>(); + MsgRequest mr = new MsgRequest(); + mr.setPhone(archiveData.getPhone()); + mr.setMemberId(null); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); + mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setHospitalId(archiveData.getHospitalId()); + mr.setTempId("657ad0e90cf25d442e62df56"); + mr.setPatientId(null); + mr.setSmsStatus(SmsStatusEnums.WFS.getId()); + mr.setServiceType(1); //判断发送类型 + mr.setFirst("【建档提醒】");// + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); + mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); + mr.setKeyword1("大同市第一人民医院");// + //planTime 和 timeType为必填 否则推送中心会推送异常 + mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setKeyword2("请前往产科门诊二楼产科网络部进行档案确认"); + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setWxTempId(WxTempleteIdEnums.YU_YUE_JIAN_DANG_TX.getId()); + messages.add(mr); + smsConfigFacade.saveMsg(messages, archiveData.getHospitalId()); + } catch (Exception e) { + logger.error("sendArchiveMsg Exception " + e); + } + } + } + /** * 大同服务内容提醒 上午9点推送 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java index a779083..d6db08e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java @@ -710,9 +710,9 @@ public class PatientCourseFacade { CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); if (type!=null&&type==2){ - courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1); + courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1 >0 ? courseModels.get(0).getEnrolmentUnderNum() - 1 : 0); }else { - courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1); + courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1 >0 ? courseModels.get(0).getEnrolmentNum() - 1 : 0); } courseService.updateCourse(courseModel); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 17544a3..5835de1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -603,7 +603,6 @@ public class PatientServiceFacade { //大同医院服务推送\短信 public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1, Integer objType, Integer type) { - System.out.println("333333333333333333333"); if ("2100002419".equals(patient.getHospitalId())) { try { //Thread.sleep(5000);