diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java index 9983fb4..49550d2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java @@ -100,6 +100,25 @@ public class PatientServiceQuery extends BaseQuery { private Date docEndTime;//'医生结束时间'; + private String serEndStartTime; + private String serEndCheckTime; + + public String getSerEndStartTime() { + return serEndStartTime; + } + + public void setSerEndStartTime(String serEndStartTime) { + this.serEndStartTime = serEndStartTime; + } + + public String getSerEndCheckTime() { + return serEndCheckTime; + } + + public void setSerEndCheckTime(String serEndCheckTime) { + this.serEndCheckTime = serEndCheckTime; + } + public Integer getDevice() { return device; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml index 205c3ef..cddc2fa 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml @@ -349,6 +349,14 @@ ]]> + + AND + =#{serEndStartTime} + and serEndTime<=#{serEndCheckTime} + ]]> + + and docStartTime = #{docStartTime,jdbcType=TIMESTAMP} 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 21107f4..9379013 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 @@ -28,7 +28,7 @@ public enum WxTempleteIdEnums { YU_YUE_JIAN_DANG_TX("tx-UmDE3YMgYaAeFccXB7HITuG_tiP9LMdX2bvBpus","建档提醒"),//预约建档未审核提醒 // FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒 // YI_SHENG_ZHI_DAO("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","医生指导"),//指导 - + FU_WU_DAO_QI_TX("YNlDxKnN_XKWZVIu0N5yOEtrAXJbFXl37KRHKx4BEyw","服务到期提醒"), //YI_SHENG_ZHI_DAO("5yoQyJ92Ruip87JWQ1zdWO9JtllyyqE3jtHGHV7GyeI","医生指导"),//指导 由于被举报 被微信平台删除 //YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导"),//指导 // WEI_JI_ZHI_DAO("fNkkLSp_gS-YWvzji6gwgdTddl4XBlk8SNP7FRksrfk","危急值提醒");//危急值提醒 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 1a57f3a..2fe86db 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 @@ -1629,6 +1629,62 @@ public class BookbuildingFacade { } } + /** + * 大同服务到期提醒 上午10点推送 + */ + public void serviceExpireSync() { + logger.info("serviceExpireSync startup..."); + PatientServiceQuery query=new PatientServiceQuery(); + final String hospitalId = "2100002419"; + query.setHospitalId(hospitalId); + query.setPerType(1); + query.setSerType(1); + query.setSerStatus(1); + String date= DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),1)); + query.setSerEndStartTime(date+" 00:00:00"); + query.setSerEndCheckTime(date+" 23:59:59"); + final List serviceList= patientServiceService.queryPatientService(query); + if (CollectionUtils.isNotEmpty(serviceList)){ + commonThreadPool.execute( + new Runnable() { + @Override public void run() { + List messages = new ArrayList<>(); + for (PatientService patientService:serviceList){ + Patients patient= patientsService.findOnePatientById(patientService.getParentid()); + if (patient!=null){ + MsgRequest mr = new MsgRequest(); + mr.setPhone(patient.getPhone()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); + mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setHospitalId(hospitalId); + mr.setTempId(patient.getId()); + mr.setPatientId(patient.getId()); + mr.setSmsStatus(SmsStatusEnums.WFS.getId()); + mr.setServiceType(1); //判断发送类型 + mr.setFirst("您好，您购买的产科服务即将到期。");// + mr.setObjType(1); + 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(DateUtil.getyyyy_MM_dd(patientService.getSerEndTime())+"。为了避免服务中断给您带来不便，建议您尽快续费。"); + //mr.setRemark(patient.getUsername()); + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setWxTempId("YNlDxKnN_XKWZVIu0N5yOEtrAXJbFXl37KRHKx4BEyw"); + messages.add(mr); + } + } + if (CollectionUtils.isNotEmpty(messages)){ + //smsConfigFacade.saveMsg(messages, hospitalId); + } + } + }); + + } + logger.info("serviceExpireSync end..."); + + } /** * 大同服务内容提醒 上午9点推送 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index f565218..66816c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -274,7 +274,7 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setType(type); if ("2100002419".equals(hospitalId)){ patientsQuery.setHospitalId(hospitalId); - if (type!=3){ + if (type!=null&&type!=3){ patientsQuery.setDtFm(true); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 7bc2545..8b6eadd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -398,6 +398,9 @@ public class RiskReportFacade { if ("2".equals(riskPatientsQueryRequest.getType())) { //1孕妇 patientsQuery.setType(1); + if ("2100002419".equals(hospitalId)){ + patientsQuery.setDtFm(true); + } } else if ("3".equals(riskPatientsQueryRequest.getType())) { //3产妇 patientsQuery.setType(3); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 996cbd8..fa5ad13 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -60,7 +60,7 @@ public class SyncDataTaskService { //urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); //urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼"); //urls.put("area-chengde-api.healthbaby.com.cn:12356","承德"); - urls.put("area-nanhe-api.healthbaby.com.cn:12356","南和"); + urls.put("area-nanhe-api.healthbaby.com.cn:1236","南和"); urls.put("area-dt-api.healthbaby.com.cn:12356","大同"); //urls.put("area-lingcheng-api.healthbaby.com.cn:12356","陵城"); }