diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 7a21321..40ec964 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -85,6 +85,21 @@ public class ViewController extends BaseController { return br; } + @RequestMapping(value = "/wx/findAntExChuData", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse findWxAntExChuData(@RequestParam("id") String id, + HttpServletRequest request) { + BaseObjectResponse br = viewFacade.findAntExChu(id); + return br; + } + + @RequestMapping(value = "/wx/findCheckDoctor", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse findCheckDoctor(@RequestParam("pid") String pid) { + BaseObjectResponse br = viewFacade.findCheckDoctor(pid); + return br; + } + /** * 大同打印高危孕妇专案卡 @@ -830,18 +845,27 @@ public class ViewController extends BaseController { * 查询复诊接口 * * @param id - * @param request * @return */ @RequestMapping(value = "/findAntenatalExaminationData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id") String id, - HttpServletRequest request) { + public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id") String id) { return viewFacade.findAntenatalExamination(id); } + /** + * 查询复诊接口 + * + * @param id + * @return + */ + @RequestMapping(value = "/wx/findAntenatalExaminationData", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse findWxAntenatalExaminationData(@RequestParam("id") String id) { + return viewFacade.findAntenatalExamination(id); + } /** * 大同打印复诊 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 c686ce1..244a37e 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 @@ -1221,7 +1221,7 @@ public class BookbuildingFacade { private void sendbuildingMsg(Patients patient, Integer subTypeId, String first, String keyWord1, String remark) { if ("1000000016".equals(patient.getHospitalId())) { try { - Thread.sleep(5000); + // Thread.sleep(5000); logger.info("sendbuildingMsg startup"); List messages = new ArrayList<>(); MsgRequest mr = new MsgRequest(); @@ -1256,7 +1256,7 @@ public class BookbuildingFacade { mr.setWxTempId(WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId()); messages.add(mr); smsConfigFacade.saveMsg(messages, patient.getHospitalId()); - } catch (InterruptedException e) { + } catch (Exception e) { logger.error("sendbuildingMsg Exception " + e); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 9df3f17..b0f0c14 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -607,7 +607,7 @@ public class PatientServiceFacade { public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1, Integer objType, Integer type) { if ("2100002419".equals(patient.getHospitalId())) { try { - Thread.sleep(3000); + // Thread.sleep(3000); logger.info("sendServiceMsg startup"); List messages = new ArrayList<>(); if (type != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 4576c86..2b1595e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1679,6 +1679,61 @@ public class ViewFacade { return bgHighRisk; } + + public BaseObjectResponse findCheckDoctor(String pid){ + BaseObjectResponse br = new BaseObjectResponse(); + + if (org.apache.commons.lang.StringUtils.isEmpty(pid)) { + br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + br.setErrormsg("id为空"); + return br; + } + + Patients patients = patientsService.findOnePatientById(pid); + if (patients == null || patients.getYn() == YnEnums.NO.getId()) { + br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + br.setErrormsg("孕妇信息不存在"); + return br; + } + + List doctorList=new ArrayList<>(); + AntExChuQuery antExChuQuery=new AntExChuQuery(); + antExChuQuery.setYn(1); + antExChuQuery.setParentId(patients.getId()); + List antExRecordModelList= antExService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExRecordModelList)){ + AntExChuModel antExChuModel= antExRecordModelList.get(0); + if (StringUtils.isNotEmpty(antExChuModel.getProdDoctor())){ + Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + Map params=new HashMap<>(); + params.put("checkDoctor",users.getName()); + doctorList.add(params); + } + } + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setParentId(patients.getId()); + antExQuery.setYn(1); + List antenatalExaminationModels = antenatalExaminationService.queryLastAntenx(antExQuery); + if (CollectionUtils.isNotEmpty(antenatalExaminationModels)){ + for (AntenatalExaminationModel antenatalExaminationModel:antenatalExaminationModels){ + if (StringUtils.isNotEmpty(antenatalExaminationModel.getCheckDoctor())){ + Users users = usersService.getUsers(Integer.parseInt(antenatalExaminationModel.getCheckDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + Map params=new HashMap<>(); + params.put("checkDoctor",users.getName()); + doctorList.add(params); + } + } + } + } + } + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + br.setData(doctorList); + return br; + } + /** * 初诊查询 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 5cde075..8445ec6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -746,7 +746,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("ygbmky", "乙肝检测结果"); initQueryMap.put("createdWeek", "建档孕周"); initQueryMap.put("coupon", "优惠券发放"); - + initQueryMap.put("dept", ""); @@ -783,7 +783,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { // initQueryMapCd.put("apgarScorePf10", "Apgar10分钟"); initQueryMapCd.put("gcStatus", "产后观察"); initQueryMapCd.put("recordsNum", "记录条数"); - + initQueryMapCd.put("dept", ""); //衡水导出 @@ -845,7 +845,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMapHs.put("deathCause", "原因"); initQueryMapHs.put("babyHealthy", "新生儿疾病"); initQueryMapHs.put("malformation", "畸形"); - + initQueryMapHs.put("dept", ""); Map normalQueryMap = new LinkedHashMap<>(); normalQueryMap.put("apgarScorePf1", "Apgar1分钟"); @@ -871,6 +871,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { normalQueryMap.put("phone", "联系方式"); normalQueryMap.put("patientId", ""); normalQueryMap.put("pid", ""); + normalQueryMap.put("dept", ""); normalQueryMap.put("rhloseBloodL", "产后24小时内失血量"); Map areaQueryMap = new LinkedHashMap<>(); areaQueryMap.put("apgarScorePf1", "Apgar1分钟"); @@ -903,7 +904,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { areaQueryMap.put("ygbmky", "乙肝检测结果"); areaQueryMap.put("createdWeek", "建档孕周"); areaQueryMap.put("coupon", "优惠券发放"); - + areaQueryMap.put("dept", ""); Map initQueryMapqhdky = new LinkedHashMap<>(); initQueryMapqhdky.put("name", "姓名"); @@ -948,7 +949,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMapqhdky.put("babyWeight", "新生儿体重"); initQueryMapqhdky.put("xsext", "新生儿血糖"); initQueryMapqhdky.put("apgarScore", "新生儿评分"); - + initQueryMapqhdky.put("dept", ""); this.initQueryMapqhdky = initQueryMapqhdky; this.initQueryMap = initQueryMap;