feat:报告数据算法调整

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

@@ -148,4 +148,10 @@ public interface QmsCommonConstant {
     
     /** 品质控制 **/
     String ASSAY_PROJECT_USAGE_QUALITY_CONTROL = "quality_control";
+
+    /** 检验完成状态-完成 **/
+    String CHECKED = "checked";
+
+    /** 检验完成状态-未完成 **/
+    String UNCHECKED = "unchecked";
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleEntrustRegistrationServiceImpl.java

@@ -7,6 +7,7 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRe
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationPageReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationSaveReqVO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -97,6 +98,7 @@ public class BusinessSampleEntrustRegistrationServiceImpl implements BusinessSam
     @Override
     public PageResult<BusinessSampleEntrustRegistrationExtendRespVO> queryWaitingDataForReport(BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
         IPage<BusinessSampleEntrustRegistrationDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        pageReqVO.setAssayStatus(QmsCommonConstant.CHECKED);
         Page<BusinessSampleEntrustRegistrationDO> pageList = businessSampleEntrustRegistrationMapper.queryWaitingDataForReport(page, pageReqVO);
         PageResult<BusinessSampleEntrustRegistrationDO> pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal());
         return BeanUtils.toBean(pageResult, BusinessSampleEntrustRegistrationExtendRespVO.class);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java

@@ -58,7 +58,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
     @Resource private ReportDocumentTypeService reportDocumentTypeService;
 
     /*
-    * 查询报告明细数据，返回结果包含报表字段配置、组装后的报告明细数据*/
+    * 查询报告明细数据，返回结果包含表头、数据、检出限等。会按报告配置进行“换行”处理。*/
     @GetMapping("/queryReportDetail")
     @Operation(summary = "查询报告明细数据")
     @Parameter(name = "mainId", description = "报告id", required = true, example = "1024")

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustRegistrationMapper.xml

@@ -65,6 +65,9 @@
             select 1 from T_RPT_DOC_MAIN dm left join T_RPT_DOC_MAIN_CORR dc on dm.id = dc.MAIN_ID
             where dc.CORR_ID = m.id and dm.FLW_STS in ('not_start','in_progress','completed','rejected') and dm.deleted = 0
             )
+            <if test="param.assayStatus != null and param.assayStatus != ''">
+                and m.ASY_STS = #{param.assayStatus}
+            </if>
             <if test="param.entrustType != null and param.entrustType != ''">
                 and m.ENTT_TP = #{param.entrustType}
             </if>