From 5b42e35df62d57c1c68bc1ef56494b4fdfa4e38d Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 14 Sep 2024 17:57:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicSkPrescribeController.java | 6 +-- .../inout/IoCodeTempController.java | 39 ++++++++++--------- .../collect/IoCollectOrderCodeManService.java | 11 ++++-- .../collect/down/ThrOrderDownload.java | 3 +- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index a2277a3f9..4b461b092 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -118,9 +118,9 @@ public class BasicSkPrescribeController extends BaseController { @PostMapping("/udiwms/basic/sk/prescribe/save") public BaseResponse sickerPrescribeSave(@RequestBody SickerPrescribeSaveRequest sickerPrescribeSaveRequest) { Integer stauts = sickerPrescribeSaveRequest.getStauts(); - if (stauts == 1){ + if (stauts == 1) { List list = sickerPrescribeSaveRequest.getList(); - if (CollUtil.isNotEmpty(list)){ + if (CollUtil.isNotEmpty(list)) { CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); for (IoCollectOrder ioCollectOrder : list) { collectOrderRequest.setBillNo(ioCollectOrder.getBillNo()); @@ -128,7 +128,7 @@ public class BasicSkPrescribeController extends BaseController { return downloadFactory.downloadOrder(collectOrderRequest); } } - }else if (stauts == 2){ + } else if (stauts == 2) { CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); collectOrderRequest.setStartTime(sickerPrescribeSaveRequest.getStartTime()); collectOrderRequest.setEndTime(sickerPrescribeSaveRequest.getEndTime()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 5cc79b3e7..7f9f25de0 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -166,7 +166,7 @@ public class IoCodeTempController extends BaseController { collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); collectOrder.setBusType(addEnterCodeRequest.getBusType()); IoCollectOrder ioCollectOrder = new IoCollectOrder(); - BeanUtils.copyProperties(collectOrder,ioCollectOrder); + BeanUtils.copyProperties(collectOrder, ioCollectOrder); collectOrderService.updateById(ioCollectOrder); BaseResponse response = ResultVOUtils.error(601, code); @@ -272,20 +272,20 @@ public class IoCodeTempController extends BaseController { // TODO: 2024/9/13 首次无单进入的时候报错提示，不需要执行校验 UdiEntity udiEntity = FilterUdiUtils.getUdi(code); if (udiEntity == null) { - String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI); - if (sptmtodi.equals("1")) { - if (code.length() == 13) { - UdiProductEntity udiProductEntity = udiProductService.findBySptm(code); - if (udiProductEntity != null) { - BaseResponse baseResponse = ResultVOUtils.error(508, "UDI码格式错误"); - baseResponse.setData(udiProductEntity); - return baseResponse; - } + String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI); + if (sptmtodi.equals("1")) { + if (code.length() == 13) { + UdiProductEntity udiProductEntity = udiProductService.findBySptm(code); + if (udiProductEntity != null) { + BaseResponse baseResponse = ResultVOUtils.error(508, "UDI码格式错误"); + baseResponse.setData(udiProductEntity); + return baseResponse; } } - BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误"); - baseResponse.setData(originCode); - return baseResponse; + } + BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误"); + baseResponse.setData(originCode); + return baseResponse; } if (IntUtil.value(udiEntity.getProductType()) == 2) { //药品 @@ -404,18 +404,20 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "追溯码不能为空"); List vailCodeResultResponses = new ArrayList<>(); for (String code : codeList) { + VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); AddOrderRequest addOrderRequest = new AddOrderRequest(); BeanUtils.copyProperties(addOrderCodeRequest, addOrderRequest); if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR); code = code.trim(); if (code.endsWith("\u001D")) { code = code.replace("\u001D", ""); - } UdiEntity udiEntity = FilterUdiUtils.getUdi(code); - if (udiEntity == null) - return ResultVOUtils.error(500, "无效条码！"); - + if (udiEntity == null) { + vailCodeResultResponse.setCode(code); + vailCodeResultResponse.setStatus(2); + vailCodeResultResponse.setErrMsg("无效条码"); + } if (StrUtil.isNotEmpty(addOrderRequest.getBatchNo())) { udiEntity.setBatchNo(addOrderRequest.getBatchNo()); } @@ -439,12 +441,13 @@ public class IoCodeTempController extends BaseController { addOrderRequest.setFromCorp(ConstantType.SPLIT_CORP); BaseResponse baseResponse = null; + addOrderRequest.setCode(code); if (IntUtil.value(udiEntity.getProductType()) == 2) { baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code); } else { baseResponse = addMaterOrder(addOrderRequest, udiEntity, code); } - VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); + if (baseResponse.getCode() == 20000) { vailCodeResultResponse.setCode(code); vailCodeResultResponse.setStatus(1); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index d273e5517..9a35525c6 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -123,6 +123,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl collectOrderBizs = collectOrderBizService.listByBillNo(addTagCodeReqeust.getBillNo()); //2.校验是否处方单UDI码 if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) { @@ -231,7 +236,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl