jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4246e8f08b954588bf37745b7162c0d889b458dd

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

update code

Showing 6 changed files with 19 additions and 17 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java View file @ 4246e8f
... ... @@ -7,21 +7,22 @@
7 7 */
8 8 public enum WxTempleteIdEnums {
9 9  
10   - YUN_FU_OPEN("A_ibmE_8_tl76m8TFc0agyN8QSA-cBpELnVnJPqD16k","开通成功提醒"),
11   - ER_TONG_OPEN("k3vUsqiG1JTL6_VlVNvmUvl2QCxj6mo3iOZfdJx01xc","开通成功提醒"),
  10 + YUN_FU_OPEN("A_ibmE_8_tl76m8TFc0agyN8QSA-cBpELnVnJPqD16k","开通成功提醒"), //孕妇开通
  11 + ER_TONG_OPEN("k3vUsqiG1JTL6_VlVNvmUvl2QCxj6mo3iOZfdJx01xc","开通成功提醒"),//儿童开通
12 12  
13 13  
14 14 CHAN_JIAN_TI_XING("EngJ9RKaHaPEEc2GapV6dJO-uu8rkqitEQd21yc4EPY","产检提醒"), //产检预约提醒
  15 + ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒
  16 + CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查"),//产后预约和产后复查
15 17  
  18 + GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),//孕妇高危
16 19  
17   - ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒
18   - JIAN_KANG_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕期健康指导提醒"),
  20 + YUN_YI_BAN_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕妇一般指导"),//孕妇
  21 + CHAN_YI_BAN_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇一般指导"),//产妇
  22 + BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导");//儿童
19 23  
20   - GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),
21 24  
22   - ER_JIAN_KANG_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童健康指导"),
23   - CHAN_JIAN_KANG_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇健康指导"),
24   - CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查");//产后预约和产后复查
  25 +
25 26 private WxTempleteIdEnums(String id, String name){
26 27 this.name=name;
27 28 this.id =id;
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java View file @ 4246e8f
... ... @@ -134,7 +134,7 @@
134 134 String messageContent = "【"+messagePrefix+"】" + message.getContent();
135 135 MessageRequest request = HelperUtils.getMessageRequest(messageContent, baby.getMphone(),
136 136 ServiceObjEnums.BABYOBJ.getId(), SmsServiceEnums.YBZD.getId(),
137   - baby.getHospitalId(), message.getId(), baby.getId(), weekDay, title, "", WxTempleteIdEnums.ER_JIAN_KANG_ZHI_DAO.getId());
  137 + baby.getHospitalId(), message.getId(), baby.getId(), weekDay, title, "", WxTempleteIdEnums.BABY_YI_BAN_ZHI_DAO.getId());
138 138  
139 139 messages.add(request);
140 140 break;
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java View file @ 4246e8f
... ... @@ -141,7 +141,7 @@
141 141 String messageContent = "【"+messagePrefix+"】" + message.getContent();
142 142 MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
143 143 ServiceObjEnums.CHANOBJ.getId(), SmsServiceEnums.YBZD.getId(),
144   - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_JIAN_KANG_ZHI_DAO.getId());
  144 + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_YI_BAN_ZHI_DAO.getId());
145 145  
146 146 messages.add(request);
147 147 break;
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java View file @ 4246e8f
... ... @@ -230,7 +230,7 @@
230 230 String messageContent = "【"+messagePrefix+"】" + message.getContent();
231 231 MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
232 232 ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.GWZD.getId(),
233   - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId());
  233 + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.GAO_WEI_ZHI_DAO.getId());
234 234  
235 235 messages.add(request);
236 236  
... ... @@ -277,7 +277,7 @@
277 277 String messageContent = "【"+messagePrefix+"】" + message.getContent();
278 278 MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
279 279 ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YBZD.getId(),
280   - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId());
  280 + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", WxTempleteIdEnums.YUN_YI_BAN_ZHI_DAO.getId());
281 281  
282 282 messages.add(request);
283 283 break;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 4246e8f
... ... @@ -160,7 +160,7 @@
160 160 model.setWeight(request.getWeight());
161 161 model.setHead(request.getHead());
162 162 model.setHeightWeight(request.getHeightWeight());
163   - model.setGrowthEvaluate(JsonUtil.array2JsonString(request.getGrowthEvaluate()));
  163 + model.setGrowthEvaluate(request.getGrowthEvaluate() == null ? "" : JsonUtil.array2JsonString(request.getGrowthEvaluate()));
164 164  
165 165  
166 166 model.setBilirubinHead(request.getBilirubinHead());
platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java View file @ 4246e8f
... ... @@ -111,7 +111,7 @@
111 111 public void run() {
112 112 try {
113 113 syncChuZhen(pid, id, mongoTemplate, lastMenses, weeks);
114   - syncFuzhen(pid, id, mongoTemplate,lastMenses,weeks);
  114 + syncFuzhen(pid, id, mongoTemplate, lastMenses, weeks);
115 115 } catch (Exception e) {
116 116 ExceptionUtils.catchException(e, "SyncAntExChu thread error.id:" + id+",pid:"+pid);
117 117 }
... ... @@ -353,7 +353,7 @@
353 353 person.setPhone(DataUtil.getString(map.get("P_MOBILEPHONE")));
354 354 person.setCreated(DataUtil.getDate(map.get("P_FILINGTIME")));
355 355 person.setModified(DataUtil.getDate(map.get("P_OPERTIME")));
356   - // mongoTemplate.save(person);
  356 + mongoTemplate.save(person);
357 357  
358 358  
359 359 patients.setPid(person.getId());
... ... @@ -660,7 +660,7 @@
660 660 patients.setVcCardNo(DataUtil.getString(map.get("VC_CARDNO"))); //就诊卡号
661 661  
662 662  
663   - // mongoTemplate.save(patients);
  663 + mongoTemplate.save(patients);
664 664 System.out.println(patients.getId() + "============");
665 665  
666 666 patientsQueue.add(new SimplePatient(person.getId(), patients.getId(),DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")),weeks));
... ... @@ -675,6 +675,7 @@
675 675  
676 676 if (map == null || map.size() == 0)
677 677 {
  678 + System.out.println(parentId+"===========");
678 679 return;
679 680 }
680 681 AntExChuModel chuModel = new AntExChuModel();
... ... @@ -807,7 +808,7 @@
807 808 long startTimes = System.currentTimeMillis();
808 809 List<Map<String, Object>> list = JDBCUtil.getOracleListDataBySql(sql);
809 810 long endTimes = System.currentTimeMillis();
810   - System.out.println("chzhenTimes==========="+(endTimes-startTimes));
  811 + System.out.println("chzhenTimes==========="+(endTimes-startTimes)+"siez===="+list.size());
811 812 for (Map<String, Object> map : list) {
812 813 AntenatalExaminationModel antxModel = new AntenatalExaminationModel();
813 814 antxModel.setPid(pid);