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 3a38ccd..a6b3e73 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 @@ -7,21 +7,22 @@ package com.lyms.platform.common.enums; */ public enum WxTempleteIdEnums { - YUN_FU_OPEN("A_ibmE_8_tl76m8TFc0agyN8QSA-cBpELnVnJPqD16k","开通成功提醒"), - ER_TONG_OPEN("k3vUsqiG1JTL6_VlVNvmUvl2QCxj6mo3iOZfdJx01xc","开通成功提醒"), + YUN_FU_OPEN("A_ibmE_8_tl76m8TFc0agyN8QSA-cBpELnVnJPqD16k","开通成功提醒"), //孕妇开通 + ER_TONG_OPEN("k3vUsqiG1JTL6_VlVNvmUvl2QCxj6mo3iOZfdJx01xc","开通成功提醒"),//儿童开通 CHAN_JIAN_TI_XING("EngJ9RKaHaPEEc2GapV6dJO-uu8rkqitEQd21yc4EPY","产检提醒"), //产检预约提醒 + ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒 + CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查"),//产后预约和产后复查 + GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),//孕妇高危 + + YUN_YI_BAN_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕妇一般指导"),//孕妇 + CHAN_YI_BAN_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇一般指导"),//产妇 + BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导");//儿童 - ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒 - JIAN_KANG_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕期健康指导提醒"), - GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"), - ER_JIAN_KANG_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童健康指导"), - CHAN_JIAN_KANG_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇健康指导"), - CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查");//产后预约和产后复查 private WxTempleteIdEnums(String id, String name){ this.name=name; this.id =id; diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java index ff4d7cf..0dde91d 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java @@ -134,7 +134,7 @@ public class BabyAmsMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】" + message.getContent(); MessageRequest request = HelperUtils.getMessageRequest(messageContent, baby.getMphone(), ServiceObjEnums.BABYOBJ.getId(), SmsServiceEnums.YBZD.getId(), - baby.getHospitalId(), message.getId(), baby.getId(), weekDay, title, "", WxTempleteIdEnums.ER_JIAN_KANG_ZHI_DAO.getId()); + baby.getHospitalId(), message.getId(), baby.getId(), weekDay, title, "", WxTempleteIdEnums.BABY_YI_BAN_ZHI_DAO.getId()); messages.add(request); break; diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java index 6fea881..8445c5b 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java @@ -141,7 +141,7 @@ public class ChanAmsMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】" + message.getContent(); MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), SmsServiceEnums.YBZD.getId(), - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_JIAN_KANG_ZHI_DAO.getId()); + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_YI_BAN_ZHI_DAO.getId()); messages.add(request); break; diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java index ce7d58b..da56a6d 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java @@ -230,7 +230,7 @@ public class YunAmsMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】" + message.getContent(); MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.GWZD.getId(), - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId()); + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.GAO_WEI_ZHI_DAO.getId()); messages.add(request); @@ -277,7 +277,7 @@ public class YunAmsMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】" + message.getContent(); MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YBZD.getId(), - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId()); + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.YUN_YI_BAN_ZHI_DAO.getId()); messages.add(request); break; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index b83bd98..ff44f35 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -160,7 +160,7 @@ public class BabyCheckFacade { model.setWeight(request.getWeight()); model.setHead(request.getHead()); model.setHeightWeight(request.getHeightWeight()); - model.setGrowthEvaluate(JsonUtil.array2JsonString(request.getGrowthEvaluate())); + model.setGrowthEvaluate(request.getGrowthEvaluate() == null ? "" : JsonUtil.array2JsonString(request.getGrowthEvaluate())); model.setBilirubinHead(request.getBilirubinHead()); diff --git a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java index b315857..dafd013 100644 --- a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java +++ b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java @@ -111,7 +111,7 @@ public class SyncDataService { public void run() { try { syncChuZhen(pid, id, mongoTemplate, lastMenses, weeks); - syncFuzhen(pid, id, mongoTemplate,lastMenses,weeks); + syncFuzhen(pid, id, mongoTemplate, lastMenses, weeks); } catch (Exception e) { ExceptionUtils.catchException(e, "SyncAntExChu thread error.id:" + id+",pid:"+pid); } @@ -353,7 +353,7 @@ public class SyncDataService { person.setPhone(DataUtil.getString(map.get("P_MOBILEPHONE"))); person.setCreated(DataUtil.getDate(map.get("P_FILINGTIME"))); person.setModified(DataUtil.getDate(map.get("P_OPERTIME"))); - // mongoTemplate.save(person); + mongoTemplate.save(person); patients.setPid(person.getId()); @@ -660,7 +660,7 @@ public class SyncDataService { patients.setVcCardNo(DataUtil.getString(map.get("VC_CARDNO"))); //就诊卡号 - // mongoTemplate.save(patients); + mongoTemplate.save(patients); System.out.println(patients.getId() + "============"); patientsQueue.add(new SimplePatient(person.getId(), patients.getId(),DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")),weeks)); @@ -675,6 +675,7 @@ public class SyncDataService { if (map == null || map.size() == 0) { + System.out.println(parentId+"==========="); return; } AntExChuModel chuModel = new AntExChuModel(); @@ -807,7 +808,7 @@ public class SyncDataService { long startTimes = System.currentTimeMillis(); List> list = JDBCUtil.getOracleListDataBySql(sql); long endTimes = System.currentTimeMillis(); - System.out.println("chzhenTimes==========="+(endTimes-startTimes)); + System.out.println("chzhenTimes==========="+(endTimes-startTimes)+"siez===="+list.size()); for (Map map : list) { AntenatalExaminationModel antxModel = new AntenatalExaminationModel(); antxModel.setPid(pid);