Commit 1020e1065782c8a9017752c4d26524d449af18f6
1 parent
51e16f9415
Exists in
master
and in
6 other branches
修复推送记录字段
Showing 2 changed files with 11 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
1020e10
| ... | ... | @@ -527,8 +527,12 @@ |
| 527 | 527 | } |
| 528 | 528 | // 调用华大接口 |
| 529 | 529 | System.out.println("debug=========>开始调用华大接口"); |
| 530 | - callHuaDa(sieveApplyOrderModel, hospitalId); | |
| 531 | - System.out.println("debug=========>结束调用华大接口"); | |
| 530 | + Boolean aBoolean = callHuaDa(sieveApplyOrderModel, hospitalId); | |
| 531 | + String number = sieveApplyOrderModel.getNumber(); | |
| 532 | + if (aBoolean != null && StringUtils.isNotEmpty(number)) { | |
| 533 | + mongoTemplate.updateFirst(Query.query(Criteria.where("number").is(number)), Update.update("huaDaPushResult", aBoolean), SieveApplyOrderModel.class); | |
| 534 | + } | |
| 535 | + System.out.println("debug=========>结束调用华大接口"); | |
| 532 | 536 | // } else { |
| 533 | 537 | // return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛"); |
| 534 | 538 | // } |
| 535 | 539 | |
| 536 | 540 | |
| ... | ... | @@ -579,10 +583,11 @@ |
| 579 | 583 | * @param sieveApplyOrderModel |
| 580 | 584 | * @param hospitalId |
| 581 | 585 | */ |
| 582 | - private void callHuaDa(SieveApplyOrderModel sieveApplyOrderModel, String hospitalId) { | |
| 586 | + private Boolean callHuaDa(SieveApplyOrderModel sieveApplyOrderModel, String hospitalId) { | |
| 583 | 587 | String sieveType = sieveApplyOrderModel.getSieveType(); |
| 588 | + Boolean result = null; | |
| 584 | 589 | if ("4".equals(HIS_VERSION)) { |
| 585 | - boolean result = false; | |
| 590 | + result = false; | |
| 586 | 591 | try{ |
| 587 | 592 | if (StringUtils.isNotEmpty(sieveType) && "2".equals(sieveType)) { |
| 588 | 593 | final String productCode = "DX1331"; |
| 589 | 594 | |
| ... | ... | @@ -718,9 +723,8 @@ |
| 718 | 723 | logger.error("调用华大接口失败", e); |
| 719 | 724 | } |
| 720 | 725 | |
| 721 | - | |
| 722 | 726 | } |
| 723 | - | |
| 727 | + return result; | |
| 724 | 728 | } |
| 725 | 729 | |
| 726 | 730 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
View file @
1020e10
| ... | ... | @@ -237,7 +237,7 @@ |
| 237 | 237 | } |
| 238 | 238 | sieveListResult.setDia(mList); |
| 239 | 239 | |
| 240 | - boolean huaDaPushResult = false; | |
| 240 | + Boolean huaDaPushResult = null; | |
| 241 | 241 | List<SieveApplyOrderModel> sieveApplyOrderModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(sieveModel.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), SieveApplyOrderModel.class); |
| 242 | 242 | if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { |
| 243 | 243 | SieveApplyOrderModel model = sieveApplyOrderModels.get(0); |