diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java index e082183..c0ec6f7 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java @@ -173,7 +173,7 @@ public class AmsMessageService { // } public static void main(String[] args) { - Map> list = getMessageTemplateMap("216", + Map> list = getMessageTemplateMap("197", AmsServiceTypeEnum.CHILD_GUIDE); List msgs = list.get("0周"); System.out.println(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index d47a548..4eb99b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -309,7 +309,7 @@ public class ApplyOrderFacade { */ public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) { SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); - String hospitalId = autoMatchFacade.getHospitalId(userId); + String hospitalId = autoMatchFacade.getHospitalId(userId); //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { @@ -346,6 +346,7 @@ public class ApplyOrderFacade { SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); sieveApplyOrderQuery.setStatus(0); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + sieveApplyOrderQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); //查询转诊申请单 List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); if (CollectionUtils.isNotEmpty(list)) { @@ -356,7 +357,7 @@ public class ApplyOrderFacade { if (null != patients) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setHospitalId(hospitalId); +// sieveQuery.setHospitalId(hospitalId); sieveQuery.setParentId(patients.getId()); List modelList = sieveService.queryList(sieveQuery); if (CollectionUtils.isEmpty(modelList)) {