20250402 更新

1.提供读取实验数据的接口指定泛型类型

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<IdentificationBookDTO> getIdentifyBookDataByBusinessId(@RequestParam("businessId") String businessId);
 
     @PostMapping(value="/identifyBookData/getTestFinishBusinessData", headers = SecurityConstants.HEADER_FROM_IN)
     public R getTestFinishBusinessData(@RequestBody List<String> synedIdList);

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){
+    public R<IdentificationBookDTO> getIdentifyBookDataByBusinessId(String businessId){
-        return identifyBookDataService.getIdentifyBookDataByBusinessId(businessId);
+        try {
+            return R.ok(identifyBookDataService.getIdentifyBookDataByBusinessId(businessId),"构建数据成功");
+        } catch (Exception e) {
+            return R.failed("获取检验数据失败！");
+        }
+
     }
     @PostMapping("/getTestFinishBusinessData")
     @ApiOperation(value = "获取待制作文书列表")

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);
 
     /**
      * 获取完成实验的数据

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;
         }
     }
     //构建文书数据

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点推送