Commit fedec5ce515432cb8e47224fb534ad4656fbdcc1
1 parent
7e32d0ad54
Exists in
master
and in
8 other branches
his接口
Showing 6 changed files with 46 additions and 88 deletions
- platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.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-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java
View file @
fedec5c
| ... | ... | @@ -183,7 +183,7 @@ |
| 183 | 183 | |
| 184 | 184 | |
| 185 | 185 | public static void main(String[] args) { |
| 186 | - Map<String,List<MessageContent>> list = getMessageTemplateMap("61f0255b-3c3b-4d5e-99e0-ee3649769a9c", | |
| 186 | + Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000006", | |
| 187 | 187 | AmsServiceTypeEnum.CHILD_GUIDE); |
| 188 | 188 | |
| 189 | 189 | // List<MessageContent> msgs = list.get("肺结核"); |
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
View file @
fedec5c
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
View file @
fedec5c
| ... | ... | @@ -328,5 +328,36 @@ |
| 328 | 328 | return result; |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | + public List<Map<String,Object>> getPatientInfoList(String cardNo){ | |
| 332 | + List<Map<String,Object>> result = new ArrayList<>(); | |
| 333 | + if (StringUtils.isNotBlank(cardNo)) { | |
| 334 | + Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); | |
| 335 | + QueryRunner queryRunner = new QueryRunner(); | |
| 336 | + try { | |
| 337 | + List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 patid as P_ID,cardno as P_CARDNO,hzxm as P_NAME, sex as P_SEX, birth as P_BIRTHDAY, sfzh as P_IDNUM, lxdh as P_MOBILEPHONE from SF_BRXXK where cardno= '"+cardNo+"'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class)); | |
| 338 | + if (list.size() > 0) { | |
| 339 | + for (PregPatientinfo info:list) { | |
| 340 | + Map<String,Object> map = new HashMap<>(); | |
| 341 | + map.put("bhnum", info.getP_BHNUM()); | |
| 342 | + if ("1".equals(info.getP_SEX())) { | |
| 343 | + map.put("sex", "男"); | |
| 344 | + } else if ("2".equals(info.getP_SEX())) { | |
| 345 | + map.put("sex", "女"); | |
| 346 | + } | |
| 347 | + map.put("name", info.getP_NAME()); | |
| 348 | + map.put("cardNo", info.getP_CARDNO()); | |
| 349 | + map.put("phone", info.getP_MOBILEPHONE()); | |
| 350 | + map.put("birth", DateUtil.getyyyy_MM_dd(info.getP_BIRTHDAY())); | |
| 351 | + result.add(map); | |
| 352 | + } | |
| 353 | + } | |
| 354 | + DbUtils.closeQuietly(conn); | |
| 355 | + } catch (SQLException e) { | |
| 356 | + DbUtils.closeQuietly(conn); | |
| 357 | + e.printStackTrace(); | |
| 358 | + } | |
| 359 | + } | |
| 360 | + return result; | |
| 361 | + } | |
| 331 | 362 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
fedec5c
| ... | ... | @@ -1507,9 +1507,9 @@ |
| 1507 | 1507 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 1508 | 1508 | antExChuQuery.setHospitalId(pat.getHospitalId()); |
| 1509 | 1509 | antExChuQuery.setParentId(pat.getId()); |
| 1510 | + Date nextTime = null; | |
| 1510 | 1511 | List<AntExChuModel> chus = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 1511 | 1512 | if (CollectionUtils.isNotEmpty(chus)) { |
| 1512 | - Date nextTime = null; | |
| 1513 | 1513 | AntExChuModel chu = chus.get(0); |
| 1514 | 1514 | if (chu != null) |
| 1515 | 1515 | { |
| 1516 | 1516 | |
| 1517 | 1517 | |
| ... | ... | @@ -1528,11 +1528,9 @@ |
| 1528 | 1528 | nextTime = ae.getNextCheckTime(); |
| 1529 | 1529 | } |
| 1530 | 1530 | } |
| 1531 | - patientsService.updatePatientOneCol(pat.getId(), nextTime); | |
| 1532 | - | |
| 1533 | 1531 | } |
| 1534 | - | |
| 1535 | 1532 | } |
| 1533 | + patientsService.updatePatientOneCol(pat.getId(), nextTime); | |
| 1536 | 1534 | } |
| 1537 | 1535 | } |
| 1538 | 1536 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
fedec5c
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | 3 | import com.lyms.hospitalapi.fnfy.FnfyHisService; |
| 4 | +import com.lyms.hospitalapi.qhdfy.QhdfyHisService; | |
| 4 | 5 | import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; |
| 5 | 6 | import com.lyms.hospitalapi.v2.HisService; |
| 6 | 7 | import com.lyms.platform.biz.service.*; |
| ... | ... | @@ -48,6 +49,8 @@ |
| 48 | 49 | @Autowired |
| 49 | 50 | private FnfyHisService fnfyHisService; |
| 50 | 51 | |
| 52 | + @Autowired | |
| 53 | + private QhdfyHisService qhdfyHisService; | |
| 51 | 54 | |
| 52 | 55 | @Autowired |
| 53 | 56 | private BabyBookbuildingService babyBookbuildingService; |
| ... | ... | @@ -642,89 +645,6 @@ |
| 642 | 645 | } |
| 643 | 646 | |
| 644 | 647 | |
| 645 | - public static void main(String[] args) { | |
| 646 | - | |
| 647 | - Integer serviceType = 1; | |
| 648 | - Integer serviceStatus = 3; | |
| 649 | - List<SmsTemplateModel> sendList = new ArrayList<>(); | |
| 650 | - List<SmsTemplateModel> temps = new ArrayList<>(); | |
| 651 | - | |
| 652 | - SmsTemplateModel model = new SmsTemplateModel(); | |
| 653 | - model.setServiceType(100); | |
| 654 | - model.setServiceStatus(7); | |
| 655 | - temps.add(model); | |
| 656 | - | |
| 657 | - if (CollectionUtils.isNotEmpty(temps)) { | |
| 658 | - | |
| 659 | - for (SmsTemplateModel temp : temps) { | |
| 660 | - if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { | |
| 661 | - sendList.add(temp); | |
| 662 | - break; | |
| 663 | - } | |
| 664 | - } | |
| 665 | - | |
| 666 | - for (SmsTemplateModel temp : temps) { | |
| 667 | - if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) { | |
| 668 | - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) { | |
| 669 | - sendList.add(temp); | |
| 670 | - break; | |
| 671 | - } | |
| 672 | - } | |
| 673 | - } | |
| 674 | - | |
| 675 | - for (SmsTemplateModel temp : temps) { | |
| 676 | - if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { | |
| 677 | - if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() | |
| 678 | - || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { | |
| 679 | - sendList.add(temp); | |
| 680 | - break; | |
| 681 | - } | |
| 682 | - } | |
| 683 | - } | |
| 684 | - | |
| 685 | - | |
| 686 | - for (SmsTemplateModel temp : temps) { | |
| 687 | - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { | |
| 688 | - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) { | |
| 689 | - sendList.add(temp); | |
| 690 | - break; | |
| 691 | - } | |
| 692 | - } | |
| 693 | - } | |
| 694 | - | |
| 695 | - | |
| 696 | - for (SmsTemplateModel temp : temps) { | |
| 697 | - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) { | |
| 698 | - if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) { | |
| 699 | - sendList.add(temp); | |
| 700 | - break; | |
| 701 | - } | |
| 702 | - } | |
| 703 | - } | |
| 704 | - | |
| 705 | - | |
| 706 | - for (SmsTemplateModel temp : temps) { | |
| 707 | - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { | |
| 708 | - if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) { | |
| 709 | - sendList.add(temp); | |
| 710 | - break; | |
| 711 | - } | |
| 712 | - } | |
| 713 | - } | |
| 714 | - | |
| 715 | - | |
| 716 | - for (SmsTemplateModel temp : temps) { | |
| 717 | - if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { | |
| 718 | - sendList.add(temp); | |
| 719 | - break; | |
| 720 | - } | |
| 721 | - } | |
| 722 | - | |
| 723 | - System.out.print(sendList.size()); | |
| 724 | - } | |
| 725 | - } | |
| 726 | - | |
| 727 | - | |
| 728 | 648 | /** |
| 729 | 649 | * 准备修改和添加的孕妇建档数据 |
| 730 | 650 | * |
| ... | ... | @@ -1290,6 +1210,8 @@ |
| 1290 | 1210 | map.put("hisPatient", qingLongXianHisService.getPatientInfoList(param.getVcCardNo())); |
| 1291 | 1211 | } else if ("5".equals(HIS_VERSION)) { |
| 1292 | 1212 | map.put("hisPatient", fnfyHisService.getPatientInfoList(param.getVcCardNo())); |
| 1213 | + }else if ("4".equals(HIS_VERSION)) { | |
| 1214 | + map.put("hisPatient", qhdfyHisService.getPatientInfoList(param.getVcCardNo())); | |
| 1293 | 1215 | } |
| 1294 | 1216 | } |
| 1295 | 1217 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
fedec5c
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | 3 | import com.lyms.hospitalapi.fnfy.FnfyHisService; |
| 4 | +import com.lyms.hospitalapi.qhdfy.QhdfyHisService; | |
| 4 | 5 | import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; |
| 5 | 6 | import com.lyms.hospitalapi.v2.HisService; |
| 6 | 7 | import com.lyms.platform.biz.dal.IPersonDao; |
| ... | ... | @@ -90,6 +91,8 @@ |
| 90 | 91 | |
| 91 | 92 | @Autowired |
| 92 | 93 | private FnfyHisService fnfyHisService; |
| 94 | + @Autowired | |
| 95 | + private QhdfyHisService qhdfyHisService; | |
| 93 | 96 | |
| 94 | 97 | |
| 95 | 98 | @Autowired |
| ... | ... | @@ -565,6 +568,8 @@ |
| 565 | 568 | typeMap.put("hisPatient", qingLongXianHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); |
| 566 | 569 | } else if ("5".equals(HIS_VERSION)) { |
| 567 | 570 | typeMap.put("hisPatient", fnfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); |
| 571 | + }else if ("4".equals(HIS_VERSION)) { | |
| 572 | + typeMap.put("hisPatient", qhdfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); | |
| 568 | 573 | } |
| 569 | 574 | } |
| 570 | 575 | } |