From 2c0a87cc3f39bbed8017765830ca62fc480d4bb8 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Wed, 2 Apr 2025 11:21:53 +0800 Subject: [PATCH] =?UTF-8?q?20250402=20=E6=9B=B4=E6=96=B0=201.=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E8=AF=BB=E5=8F=96=E5=AE=9E=E9=AA=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=8C=87=E5=AE=9A=E6=B3=9B=E5=9E=8B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/feign/RemoteTestToIdentifyService.java | 2 +- .../inspection/controller/IdentifyBookController.java | 11 +++++++++-- .../inspection/service/IdentifyBookDataService.java | 3 ++- .../service/impl/IdentifyBookDataServiceImpl.java | 6 +++--- .../service/impl/PushDataToLabsCareServiceImpl.java | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/feign/RemoteTestToIdentifyService.java b/dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/feign/RemoteTestToIdentifyService.java index 2e7f377..d4c69e7 100644 --- a/dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/feign/RemoteTestToIdentifyService.java +++ b/dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/feign/RemoteTestToIdentifyService.java @@ -28,7 +28,7 @@ public interface RemoteTestToIdentifyService { * @return */ @GetMapping(value="/identifyBookData/getIdentifyBookDataByBusinessId", headers = SecurityConstants.HEADER_FROM_IN) - public R getIdentifyBookDataByBusinessId(@RequestParam("businessId") String businessId); + public R getIdentifyBookDataByBusinessId(@RequestParam("businessId") String businessId); @PostMapping(value="/identifyBookData/getTestFinishBusinessData", headers = SecurityConstants.HEADER_FROM_IN) public R getTestFinishBusinessData(@RequestBody List synedIdList); diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java index 86e1fdf..bbf2d0f 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java @@ -1,7 +1,9 @@ package digital.laboratory.platform.inspection.controller; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.inspection.service.IdentifyBookDataService; +import digital.laboratory.platform.inspetion.api.entity.IdentificationBookDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -25,8 +27,13 @@ public class IdentifyBookController { //对文书系统提供获取实验数据 @GetMapping("/getIdentifyBookDataByBusinessId") @ApiOperation(value = "获取检验数据") - public R getIdentifyBookDataByBusinessId(String businessId){ - return identifyBookDataService.getIdentifyBookDataByBusinessId(businessId); + public R getIdentifyBookDataByBusinessId(String businessId){ + try { + return R.ok(identifyBookDataService.getIdentifyBookDataByBusinessId(businessId),"构建数据成功"); + } catch (Exception e) { + return R.failed("获取检验数据失败!"); + } + } @PostMapping("/getTestFinishBusinessData") @ApiOperation(value = "获取待制作文书列表") diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/IdentifyBookDataService.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/IdentifyBookDataService.java index 823e2ed..101cdeb 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/IdentifyBookDataService.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/IdentifyBookDataService.java @@ -2,6 +2,7 @@ package digital.laboratory.platform.inspection.service; import com.baomidou.mybatisplus.extension.service.IService; import digital.laboratory.platform.common.core.util.R; +import digital.laboratory.platform.inspetion.api.entity.IdentificationBookDTO; import org.apache.poi.ss.formula.functions.T; import java.util.List; @@ -20,7 +21,7 @@ public interface IdentifyBookDataService { * @param businessId * @return */ - R getIdentifyBookDataByBusinessId(String businessId); + IdentificationBookDTO getIdentifyBookDataByBusinessId(String businessId); /** * 获取完成实验的数据 diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java index 1a9b139..3999166 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java @@ -75,14 +75,14 @@ public class IdentifyBookDataServiceImpl implements IdentifyBookDataService { * @return */ @Override - public R getIdentifyBookDataByBusinessId(String businessId) { + public IdentificationBookDTO getIdentifyBookDataByBusinessId(String businessId) { //一个委托案件,只能属于一个实验,不允许一个委托中的检材分配到2个实验中做实验,这个是前提 if(ObjectUtils.isNotEmpty(businessId)){ IdentificationBookDTO identificationBookDTO = buildBookDataDetail(businessId); - return R.ok(identificationBookDTO,"构建数据成功"); + return identificationBookDTO; }else { log.info("参数业务id不能为空,请检查参数{}",businessId); - return R.failed("参数业务id不能为空,请检查参数"+businessId); + return null; } } //构建文书数据 diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java index 221e1d9..13114e1 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java @@ -90,7 +90,7 @@ public class PushDataToLabsCareServiceImpl implements PushDataToLabsCareService private final static String BIOLOGY_QUALITATIVE_RECORD = "BiologyQualitativeRecord"; // 普通检材定性记录非红外报告标识 - private final static String NON_INFRARED_GENERAL_QUALITATIVE_RECORD = "nonInfraredGeneralQualitativeRecord"; + private final static String NON_INFRARED_GENERAL_QUALITATIVE_RECORD = "NonInfraredGeneralQualitativeRecord"; /** * 做一个定时推送,对于推送失败的委托进行重新推送, 每天凌晨1点推送