diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java index ca25bac..cfb9a50 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java @@ -183,7 +183,7 @@ public class AmsMessageService { public static void main(String[] args) { - Map> list = getMessageTemplateMap("61f0255b-3c3b-4d5e-99e0-ee3649769a9c", + Map> list = getMessageTemplateMap("1000000006", AmsServiceTypeEnum.CHILD_GUIDE); // List msgs = list.get("肺结核"); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java index 7b587ea..6eeb056 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java @@ -27,8 +27,10 @@ public class PregPatientinfo { private String P_IDNUM; private Date P_BIRTHDAY; private Date CREATED; + //门诊或者是住院 private String SICKTYPE; + public String getSICKTYPE() { return SICKTYPE; } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index a4dfa06..ce5f1e0 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -328,4 +328,35 @@ public class QhdfyHisService { return result; } + public List> getPatientInfoList(String cardNo){ + List> result = new ArrayList<>(); + if (StringUtils.isNotBlank(cardNo)) { + Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); + QueryRunner queryRunner = new QueryRunner(); + try { + List 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.class)); + if (list.size() > 0) { + for (PregPatientinfo info:list) { + Map map = new HashMap<>(); + map.put("bhnum", info.getP_BHNUM()); + if ("1".equals(info.getP_SEX())) { + map.put("sex", "男"); + } else if ("2".equals(info.getP_SEX())) { + map.put("sex", "女"); + } + map.put("name", info.getP_NAME()); + map.put("cardNo", info.getP_CARDNO()); + map.put("phone", info.getP_MOBILEPHONE()); + map.put("birth", DateUtil.getyyyy_MM_dd(info.getP_BIRTHDAY())); + result.add(map); + } + } + DbUtils.closeQuietly(conn); + } catch (SQLException e) { + DbUtils.closeQuietly(conn); + e.printStackTrace(); + } + } + return result; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 41cfb06..632c9f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1507,9 +1507,9 @@ public class AntenatalExaminationFacade { antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setHospitalId(pat.getHospitalId()); antExChuQuery.setParentId(pat.getId()); + Date nextTime = null; List chus = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(chus)) { - Date nextTime = null; AntExChuModel chu = chus.get(0); if (chu != null) { @@ -1528,11 +1528,9 @@ public class AntenatalExaminationFacade { nextTime = ae.getNextCheckTime(); } } - patientsService.updatePatientOneCol(pat.getId(), nextTime); - } - } + patientsService.updatePatientOneCol(pat.getId(), nextTime); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 283488d..0dd1375 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.fnfy.FnfyHisService; +import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; import com.lyms.platform.biz.service.*; @@ -48,6 +49,8 @@ public class BabyBookbuildingFacade { @Autowired private FnfyHisService fnfyHisService; + @Autowired + private QhdfyHisService qhdfyHisService; @Autowired private BabyBookbuildingService babyBookbuildingService; @@ -642,89 +645,6 @@ public class BabyBookbuildingFacade { } - public static void main(String[] args) { - - Integer serviceType = 1; - Integer serviceStatus = 3; - List sendList = new ArrayList<>(); - List temps = new ArrayList<>(); - - SmsTemplateModel model = new SmsTemplateModel(); - model.setServiceType(100); - model.setServiceStatus(7); - temps.add(model); - - if (CollectionUtils.isNotEmpty(temps)) { - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { - sendList.add(temp); - break; - } - } - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) { - sendList.add(temp); - break; - } - } - } - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { - if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() - || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) { - if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { - sendList.add(temp); - break; - } - } - - System.out.print(sendList.size()); - } - } - - /** * 准备修改和添加的孕妇建档数据 * @@ -1290,6 +1210,8 @@ public class BabyBookbuildingFacade { map.put("hisPatient", qingLongXianHisService.getPatientInfoList(param.getVcCardNo())); } else if ("5".equals(HIS_VERSION)) { map.put("hisPatient", fnfyHisService.getPatientInfoList(param.getVcCardNo())); + }else if ("4".equals(HIS_VERSION)) { + map.put("hisPatient", qhdfyHisService.getPatientInfoList(param.getVcCardNo())); } } } 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 2279cac..fd192fb 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.fnfy.FnfyHisService; +import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; import com.lyms.platform.biz.dal.IPersonDao; @@ -90,6 +91,8 @@ public class BookbuildingFacade { @Autowired private FnfyHisService fnfyHisService; + @Autowired + private QhdfyHisService qhdfyHisService; @Autowired @@ -565,6 +568,8 @@ public class BookbuildingFacade { typeMap.put("hisPatient", qingLongXianHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); } else if ("5".equals(HIS_VERSION)) { typeMap.put("hisPatient", fnfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); + }else if ("4".equals(HIS_VERSION)) { + typeMap.put("hisPatient", qhdfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); } } }