Commit 083525aa597fa197c0f14f5541d171d7b0e0d6d2
1 parent
384a358eca
Exists in
master
and in
6 other branches
产筛
Showing 2 changed files with 4 additions and 3 deletions
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
View file @
083525a
| ... | ... | @@ -173,7 +173,7 @@ |
| 173 | 173 | // } |
| 174 | 174 | |
| 175 | 175 | public static void main(String[] args) { |
| 176 | - Map<String,List<MessageContent>> list = getMessageTemplateMap("216", | |
| 176 | + Map<String,List<MessageContent>> list = getMessageTemplateMap("197", | |
| 177 | 177 | AmsServiceTypeEnum.CHILD_GUIDE); |
| 178 | 178 | List<MessageContent> msgs = list.get("0周"); |
| 179 | 179 | System.out.println(list); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
083525a
| ... | ... | @@ -309,7 +309,7 @@ |
| 309 | 309 | */ |
| 310 | 310 | public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) { |
| 311 | 311 | SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); |
| 312 | - String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 312 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 313 | 313 | |
| 314 | 314 | //表示区域的 |
| 315 | 315 | if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { |
| ... | ... | @@ -346,6 +346,7 @@ |
| 346 | 346 | SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); |
| 347 | 347 | sieveApplyOrderQuery.setStatus(0); |
| 348 | 348 | sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); |
| 349 | + sieveApplyOrderQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); | |
| 349 | 350 | //查询转诊申请单 |
| 350 | 351 | List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); |
| 351 | 352 | if (CollectionUtils.isNotEmpty(list)) { |
| ... | ... | @@ -356,7 +357,7 @@ |
| 356 | 357 | if (null != patients) { |
| 357 | 358 | SieveQuery sieveQuery = new SieveQuery(); |
| 358 | 359 | sieveQuery.setYn(YnEnums.YES.getId()); |
| 359 | - sieveQuery.setHospitalId(hospitalId); | |
| 360 | +// sieveQuery.setHospitalId(hospitalId); | |
| 360 | 361 | sieveQuery.setParentId(patients.getId()); |
| 361 | 362 | List<SieveModel> modelList = sieveService.queryList(sieveQuery); |
| 362 | 363 | if (CollectionUtils.isEmpty(modelList)) { |