Commit e5bf895c9b7601741d27df806a6625ed2bd2fd65
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 6 changed files
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
- platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java
View file @
e5bf895
... | ... | @@ -25,7 +25,7 @@ |
25 | 25 | * 对于不能访问外网的医院,先存到本地的库,由公网定时读并转发到短信中心 |
26 | 26 | */ |
27 | 27 | public boolean savePostMsg(String jsonData, String hospitalId) { |
28 | - if ("216".equals(hospitalId)) { | |
28 | + // if ("216".equals(hospitalId)) { | |
29 | 29 | SyncDataModel model = new SyncDataModel(); |
30 | 30 | model.setStatus(1); |
31 | 31 | model.setJsonData(jsonData); |
... | ... | @@ -35,9 +35,9 @@ |
35 | 35 | model.setModified(model.getCreated()); |
36 | 36 | iSyncDataDao.addSyncData(model); |
37 | 37 | return true; |
38 | - } else { | |
39 | - return false; | |
40 | - } | |
38 | +// } else { | |
39 | +// return false; | |
40 | +// } | |
41 | 41 | } |
42 | 42 | |
43 | 43 | public SyncDataModel addSyncData(SyncDataModel obj) { |
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
View file @
e5bf895
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
View file @
e5bf895
1 | 1 | package com.lyms.hospitalapi.qhdfy; |
2 | 2 | |
3 | 3 | import com.lyms.platform.biz.service.PatientsService; |
4 | -import com.lyms.platform.common.enums.FmTypeEnums; | |
5 | -import com.lyms.platform.common.enums.RenShenJieJuEnums; | |
6 | -import com.lyms.platform.common.enums.TpmcTypeEnums; | |
7 | -import com.lyms.platform.common.enums.YnEnums; | |
4 | +import com.lyms.platform.common.enums.*; | |
8 | 5 | import com.lyms.platform.common.utils.DateUtil; |
9 | 6 | import com.lyms.platform.common.utils.ExceptionUtils; |
10 | 7 | import com.lyms.platform.common.utils.JsonUtil; |
11 | 8 | import com.lyms.platform.common.utils.StringUtils; |
9 | +import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade; | |
12 | 10 | import com.lyms.platform.operate.web.facade.MatDeliverFacade; |
11 | +import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; | |
13 | 12 | import com.lyms.platform.operate.web.request.MatDeliverAddRequest; |
14 | 13 | import com.lyms.platform.permission.model.Users; |
15 | 14 | import com.lyms.platform.permission.model.UsersQuery; |
... | ... | @@ -44,6 +43,9 @@ |
44 | 43 | @Autowired |
45 | 44 | private UsersService usersService; |
46 | 45 | |
46 | + @Autowired | |
47 | + private BabyBookbuildingFacade babyBookbuildingFacade; | |
48 | + | |
47 | 49 | public void fmTimerWork() { |
48 | 50 | SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
49 | 51 | Date end = new Date(); |
50 | 52 | |
... | ... | @@ -219,7 +221,13 @@ |
219 | 221 | |
220 | 222 | } |
221 | 223 | } |
224 | + else | |
225 | + //秦皇岛服务器有分娩记录,但是在这边系统没有对于孕妇 取分娩信息建档儿童数据 | |
226 | + { | |
227 | + buildBaby( item, patInfo, dueDateStr, dueDate); | |
222 | 228 | |
229 | + } | |
230 | + | |
223 | 231 | } catch (Exception e) |
224 | 232 | { |
225 | 233 | ExceptionUtils.catchException(e, "数据异常"); |
... | ... | @@ -394,6 +402,21 @@ |
394 | 402 | |
395 | 403 | } |
396 | 404 | } |
405 | + else | |
406 | + { | |
407 | + for (FmItem i : items) | |
408 | + { | |
409 | + String dueDateStr1 = i.getSsrq(); | |
410 | + if (!StringUtils.isNotEmpty(dueDateStr1)) | |
411 | + { | |
412 | + continue; | |
413 | + } | |
414 | + Date dueDate1 = fmt.parse(dueDateStr1); | |
415 | + buildBaby( i,patInfo, dueDateStr1, dueDate1); | |
416 | + } | |
417 | + | |
418 | + } | |
419 | + | |
397 | 420 | } |
398 | 421 | } |
399 | 422 | } |
400 | 423 | |
401 | 424 | |
... | ... | @@ -402,11 +425,89 @@ |
402 | 425 | ExceptionUtils.catchException(e, "sql执行异常"); |
403 | 426 | e.printStackTrace(); |
404 | 427 | } catch (ParseException e) { |
405 | - ExceptionUtils.catchException(e,"分娩日期解析错误"); | |
428 | + ExceptionUtils.catchException(e, "分娩日期解析错误"); | |
406 | 429 | e.printStackTrace(); |
430 | + } catch (Exception e) | |
431 | + { | |
432 | + ExceptionUtils.catchException(e, "发生异常"); | |
433 | + e.printStackTrace(); | |
407 | 434 | }finally { |
408 | 435 | DbUtils.closeQuietly(conn); |
409 | 436 | } |
437 | + } | |
438 | + | |
439 | + | |
440 | + public void buildBaby(FmItem item,FmPatInfo patInfo, String dueDateStr,Date dueDate) | |
441 | + { | |
442 | + try{ | |
443 | + UsersQuery usersQuery = new UsersQuery(); | |
444 | + usersQuery.setYn(YnEnums.YES.getId()); | |
445 | + usersQuery.setName("产房"); | |
446 | + List<Users> users = usersService.queryUsers(usersQuery); | |
447 | + | |
448 | + BabyBookbuildingAddRequest request = new BabyBookbuildingAddRequest(); | |
449 | + request.setHospitalId("216"); | |
450 | + | |
451 | + request.setMommyName(patInfo.getBRXM()); //母亲姓名 | |
452 | + request.setMommyCertificateTypeId("57e0a21c0cf209b410a82cda"); //证件类型 (手机号码) | |
453 | + request.setMommyCertificateNum(patInfo.getLXDH()); //证件号 | |
454 | + request.setMommyPhone(patInfo.getLXDH()); | |
455 | + String babyName = patInfo.getBRXM()+("男".equals(item.getYexb()) ? "之子" : "之女"); | |
456 | + request.setBabyName(babyName); | |
457 | + request.setSex("男".equals(item.getYexb()) ? 1 : 0); | |
458 | + | |
459 | + request.setBabyBirthday(dueDateStr); //生日 | |
460 | + | |
461 | + if (StringUtils.isNotEmpty(item.getRc())) { | |
462 | + String week = ""; | |
463 | + if (item.getRc().split("\\u002B").length > 1) { | |
464 | + week = item.getRc().split("\\u002B")[0] + "周"; | |
465 | + } else { | |
466 | + week = item.getRc() + "周"; | |
467 | + } | |
468 | + try { | |
469 | + request.setDueWeek(Integer.parseInt(week)); //分娩孕周 | |
470 | + }catch (Exception e) | |
471 | + { | |
472 | + | |
473 | + } | |
474 | + } | |
475 | + | |
476 | + String tpmcType = ""; | |
477 | + if ("手术产".equals(item.getTpmcfs())) { | |
478 | + tpmcType = FmTypeEnums.O1.getId(); | |
479 | + } else if ("自然产出".equals(item.getTpmcfs())) { | |
480 | + tpmcType = FmTypeEnums.O.getId(); | |
481 | + } | |
482 | + | |
483 | + request.setDueType(tpmcType);//分娩方式 | |
484 | + request.setFetusCount(item.getDjt()); //第几胎 | |
485 | + request.setDueCount(item.getCjc());//第几产 | |
486 | + request.setBabyWeight(item.getTz()); //体重 | |
487 | + request.setBabyHeight(item.getSc()); //身长 | |
488 | + Map<String,String> map = new HashMap<>(); | |
489 | + map.put("pf1",item.getYfz()); | |
490 | + map.put("pf5", item.getWfz()); | |
491 | + map.put("pf10", item.getSfz()); | |
492 | + request.setApgarScore(map); | |
493 | + | |
494 | + request.setBuildDoctor(users.get(0).getId() + ""); | |
495 | + request.setBuildDate(DateUtil.getyyyy_MM_dd(dueDate)); | |
496 | + request.setHighRisk("是".equals(item.getSfgw()) ? 1 : 0); | |
497 | + request.setMalformation("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 | |
498 | + | |
499 | + request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 | |
500 | + request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 | |
501 | + | |
502 | + | |
503 | + babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId()); | |
504 | + }catch (Exception e) | |
505 | + { | |
506 | + ExceptionUtils.catchException(e, "buildBaby exception"); | |
507 | + e.printStackTrace(); | |
508 | + } | |
509 | + | |
510 | + | |
410 | 511 | } |
411 | 512 | |
412 | 513 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
e5bf895
... | ... | @@ -754,10 +754,15 @@ |
754 | 754 | if (CollectionUtils.isNotEmpty(messages)) { |
755 | 755 | smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); |
756 | 756 | smsList.setMessages(messages); |
757 | - if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { | |
757 | + | |
758 | + //秦皇岛建档 | |
759 | + if (syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { | |
758 | 760 | ExceptionUtils.catchException("儿童建档3---------->"+babyModel.getMphone()+";name="+babyModel.getName()); |
759 | - MessageCenterService.saveSmsCenter(smsList); | |
760 | 761 | } |
762 | + | |
763 | + //线上 | |
764 | +// MessageCenterService.saveSmsCenter(smsList); | |
765 | +// ExceptionUtils.catchException("儿童建档3---------->"+babyModel.getMphone()+";name="+babyModel.getName()); | |
761 | 766 | } |
762 | 767 | } |
763 | 768 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
e5bf895
... | ... | @@ -380,9 +380,14 @@ |
380 | 380 | smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); |
381 | 381 | smsList.setMessages(messages); |
382 | 382 | //调用发送接口 |
383 | - if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { | |
384 | - MessageCenterService.saveSmsCenter(smsList); | |
385 | - } | |
383 | + | |
384 | + //保存到同步表中 | |
385 | + syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1()); | |
386 | + | |
387 | + | |
388 | + //保存到短信中心 | |
389 | + //MessageCenterService.saveSmsCenter(smsList); | |
390 | + | |
386 | 391 | } |
387 | 392 | } |
388 | 393 | } |
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
View file @
e5bf895
... | ... | @@ -114,7 +114,7 @@ |
114 | 114 | <ref bean="delSieveTrigger"/> |
115 | 115 | <ref bean="addSieveJobTrigger"/> |
116 | 116 | <ref bean="correctSieveOrderTrigger"/> |
117 | - <ref bean="qhdFmTrigger"/> | |
117 | + <!--<ref bean="qhdFmTrigger"/>--> | |
118 | 118 | <!--<ref bean="crisisTrigger"/>--> |
119 | 119 | </list> |
120 | 120 | </property> |