20250218 更新

2025-02-18 17:57:42 +08:00
parent 8c8903148e
commit 4db1ffe3b7
12 changed files with 437 additions and 97 deletions
--- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
@@ -1,11 +1,15 @@
 package digital.laboratory.platform.entrustment.controller;

 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import digital.laboratory.platform.common.core.exception.CheckedException;
 import digital.laboratory.platform.common.core.util.R;
 import digital.laboratory.platform.entrustment.convert.EntrustMaterialCheckoutResultConvert;
 import digital.laboratory.platform.entrustment.dto.EntrustMaterialCheckoutResultDTO;
+import digital.laboratory.platform.entrustment.query.BaseQuery;
+import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery;
 import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService;
+import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -52,6 +56,18 @@ public class EntrustMaterialCheckoutResultController {
        return success ? R.ok("保存检出得定性定量结果成功！") : R.ok("保存检出得定性定量结果失败！");
    }

+    @ApiOperation("检出得定性定量结果分页查询")
+    @GetMapping("/page")
+    public R<IPage<EntrustMaterialCheckoutResultVO>> page(EntrustMaterialCheckoutResultQuery query) {
+        IPage<EntrustMaterialCheckoutResultVO> voiPage;
+        try {
+            voiPage = entrustMaterialCheckoutResultService.voiPage(query);
+        } catch (CheckedException e) {
+            return R.failed(e.getMessage());
+        }
+        return R.ok(voiPage);
+    }
+
    @ApiOperation("导出检材检出结果的excel表格")
    @PostMapping("/exportExcel")
    public void exportExcel(@RequestBody List<String> entrustIds, HttpServletResponse response) {
--- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
@@ -22,6 +22,7 @@ import digital.laboratory.platform.entrustment.entity.CaseEvent;
 import digital.laboratory.platform.entrustment.entity.Entrustment;
 import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
 import digital.laboratory.platform.entrustment.service.CaseEventService;
+import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService;
 import digital.laboratory.platform.entrustment.service.EntrustmentService;
 import digital.laboratory.platform.entrustment.vo.CaseEventVO;
 import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
@@ -80,6 +81,8 @@ public class EntrustmentController {

    private final RemoteOrgService remoteOrgService;

+    private final EntrustMaterialCheckoutResultService entrustMaterialCheckoutResultService;
+
    //private  final  RestTemplate restTemplate;

 //	/**
@@ -157,7 +160,8 @@ public class EntrustmentController {
                                                           @RequestParam(value = "submitter", required = false) String submitter,
                                                           @RequestParam(value = "checkCandidateUser", required = false) String checkCandidateUser,
                                                           @RequestParam(value = "checkUser", required = false) String checkUser,
-                                                           @RequestParam(value = "dataSources", required = false) Integer dataSources) {
+                                                           @RequestParam(value = "dataSources", required = false) Integer dataSources,
+                                                           @RequestParam(value = "checkoutQuery", required = false, defaultValue = "0") Integer checkoutQuery) {
        String orgId = null;
        DLPUser dlpUser = SecurityUtils.getUser();
        System.out.println(String.format("getEntrustmentPage 用户 %s 的 id=%s [%s]", dlpUser.getUsername(), dlpUser.getId(), (dlpUser.isStaff()) ? "鉴定机构员工" : "普通用户"));
@@ -186,10 +190,16 @@ public class EntrustmentController {
                    .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
                    .in((statuses != null) && (statuses.size() > 0), "e.status", statuses)
                    .eq(dataSources != null, "e.data_sources", dataSources)
+                    .inSql(checkoutQuery.equals(1), "e.id", "SELECT entrust_id FROM b_entrust_material_checkout_result") // 筛选检材检出结果记录不为0 的委托
                    .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
                    .orderByDesc(statuses != null && statuses.size() > 0 && statuses.get(0) == 9, "CAST(SUBSTRING(e.accept_no, 1,4) AS UNSIGNED)","CAST(SUBSTRING(e.accept_no, 6) AS UNSIGNED)")
                    .orderByDesc(statuses != null && statuses.size() > 0 && statuses.get(0) == 7, "CAST(SUBSTRING(e.entrustment_no, 4,4) AS UNSIGNED)","CAST(SUBSTRING(e.entrustment_no, 9) AS UNSIGNED)")
            );
+            if (checkoutQuery.equals(1)) {
+                thePage.getRecords().forEach(record -> {
+                    record.setCheckoutResultStr(entrustMaterialCheckoutResultService.buildEntrustMaterialCheckoutResultStr(record.getId()));
+                });
+            }
        } else {
            //-- 当前用户是普通用户, 不是鉴定中心员工
            System.out.println(String.format("用户 %s 的 id=%s, 不是鉴定机构员工", dlpUser.getUsername(), dlpUser.getId()));
--- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialCheckoutResult.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialCheckoutResult.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import digital.laboratory.platform.common.mybatis.base.BaseEntity;
 import digital.laboratory.platform.sys.entity.DrugLite;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 import java.io.Serializable;
@@ -25,6 +26,12 @@ public class EntrustMaterialCheckoutResult extends BaseEntity {
    @TableId(value = "entrust_material_id", type = IdType.ASSIGN_ID)
    private String id;

+    /**
+     * 委托检材id
+     */
+    @ApiModelProperty(value = "委托id")
+    private String entrustId;
+
    /**
     * 定性结果
     */
--- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java
@@ -1,8 +1,18 @@
 package digital.laboratory.platform.entrustment.mapper;

+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult;
+import digital.laboratory.platform.entrustment.entity.Entrustment;
+import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
+import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;

 /**
 * @author ChenJiangBao
@@ -13,6 +23,11 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
 public interface EntrustMaterialCheckoutResultMapper extends BaseMapper<EntrustMaterialCheckoutResult> {

+    IPage<EntrustMaterialCheckoutResultVO> getEntrustMaterialCheckoutResultVOPage(@Param("page") IPage<EntrustMaterialCheckoutResult> page, @Param(Constants.WRAPPER) Wrapper<EntrustMaterialCheckoutResult> qw);
+
+
+    List<EntrustMaterialCheckoutResultVO> voList(@Param(Constants.WRAPPER) Wrapper<EntrustMaterialCheckoutResult> qw);
+
 }


--- a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustMaterialCheckoutResultQuery.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustMaterialCheckoutResultQuery.java
@@ -0,0 +1,22 @@
+package digital.laboratory.platform.entrustment.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 委托中检材检出结果消息 查询对象（分页查询、列表查询）
+ *
+ * @author Chen
+ * @since 1.0.0 2025-02-18
+ */
+@Data
+@ApiModel(description = "委托中检材检出结果消息 查询对象（分页查询、列表查询）")
+public class EntrustMaterialCheckoutResultQuery extends BaseQuery {
+
+    @ApiModelProperty("委托id")
+    private String entrustId;
+
+}
--- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java
@@ -1,8 +1,11 @@
 package digital.laboratory.platform.entrustment.service;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import digital.laboratory.platform.entrustment.dto.EntrustMaterialCheckoutResultDTO;
 import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult;
+import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery;
+import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;

 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -15,6 +18,14 @@ import java.util.List;
 */
 public interface EntrustMaterialCheckoutResultService extends IService<EntrustMaterialCheckoutResult> {

+    /**
+     * 构建委托材料检验结果字符串
+     *
+     * @param entrustId 委托ID
+     * @return 委托材料检验结果字符串
+     */
+    String buildEntrustMaterialCheckoutResultStr(String entrustId);
+
    /**
     * 根据DTO保存检材得检出结果信息
     * @param dto 检出DTO
@@ -30,4 +41,10 @@ public interface EntrustMaterialCheckoutResultService extends IService<EntrustMa
     */
    void exportExcel(List<String> entrustIds, HttpServletResponse response) throws IOException;

+    /**
+     * vo 分页对象
+     * @param query
+     * @return
+     */
+    IPage<EntrustMaterialCheckoutResultVO> voiPage(EntrustMaterialCheckoutResultQuery query);
 }
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
@@ -1,7 +1,10 @@
 package digital.laboratory.platform.entrustment.service.impl;

 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import digital.laboratory.platform.common.core.exception.CheckedException;
 import digital.laboratory.platform.entrustment.convert.DrugLiteConvert;
@@ -13,14 +16,17 @@ import digital.laboratory.platform.entrustment.entity.Entrustment;
 import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
 import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
 import digital.laboratory.platform.entrustment.mapper.EntrustMaterialCheckoutResultMapper;
+import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery;
 import digital.laboratory.platform.entrustment.service.CommonFeignService;
 import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService;
 import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService;
 import digital.laboratory.platform.entrustment.service.EntrustmentService;
+import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
 import digital.laboratory.platform.sys.entity.Area;
 import digital.laboratory.platform.sys.entity.DrugLite;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
@@ -29,10 +35,7 @@ import java.io.IOException;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;

@@ -54,6 +57,40 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
    @Resource
    private CommonFeignService commonFeignService;

+
+    /**
+     * 构建委托材料检验结果字符串
+     *
+     * @param entrustId 委托ID
+     * @return 委托材料检验结果字符串
+     */
+    @Override
+    public String buildEntrustMaterialCheckoutResultStr(String entrustId) {
+        // 先获取检材列表
+        List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId));
+        Map<String, EntrustmentIdentificationMaterial> materialMap = materialList.stream().collect(Collectors.toMap(EntrustmentIdentificationMaterial::getId, Function.identity()));
+        // 获取检测结果
+        List<EntrustMaterialCheckoutResult> checkoutResultList = super.list(Wrappers.<EntrustMaterialCheckoutResult>lambdaQuery().eq(EntrustMaterialCheckoutResult::getEntrustId, entrustId));
+        if (CollUtil.isEmpty(checkoutResultList)) {
+            return "";
+        }
+
+        List<String> resultStrList = new ArrayList<>();
+        // 对检测结果进行分组
+        Map<String, List<EntrustMaterialCheckoutResult>> checkoutResultGroupMap = checkoutResultList.stream().collect(Collectors.groupingBy(item -> DrugLiteConvert.joiningDrugListNameToStr(item.getQualitativeResult(), "、")));
+
+        checkoutResultGroupMap.forEach((key, value) -> {
+            StringBuilder builder = new StringBuilder();
+            builder
+                    .append(value.stream().map(item -> materialMap.get(item.getId()).getOrderNo1()).collect(Collectors.joining("、")))
+                    .append(" : [")
+                    .append(key)
+                    .append("]");
+            resultStrList.add(builder.toString());
+        });
+        return resultStrList.stream().sorted().collect(Collectors.joining("\n"));
+    }
+
    /**
     * 根据DTO保存检材得检出结果信息
     * @param dto 检出DTO
@@ -79,6 +116,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
            }
            EntrustMaterialCheckoutResult entrustMaterialCheckoutResult = EntrustMaterialCheckoutResultConvert.dtoToEntity(dto);
            entrustMaterialCheckoutResult.setId(id);
+            entrustMaterialCheckoutResult.setEntrustId(identificationMaterial.getEntrustmentId());
            if (super.count(Wrappers.<EntrustMaterialCheckoutResult>lambdaQuery().eq(EntrustMaterialCheckoutResult::getId, id)) <= 0) {
 //            throw new CheckedException(String.format("检材编号 [%s] 的检材检出结果已经存在！", identificationMaterial.getImNo()));
                success = super.save(entrustMaterialCheckoutResult);
@@ -143,6 +181,35 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
        buildExcel(response, checkoutResultExcelDTOS);
    }

+    /**
+     * vo 分页对象
+     * @param query
+     * @return
+     */
+    @Override
+    public IPage<EntrustMaterialCheckoutResultVO> voiPage(EntrustMaterialCheckoutResultQuery query) {
+        IPage<EntrustMaterialCheckoutResult> page = this.page(
+                new Page<>(query.getCurrent(), query.getSize()),
+                Wrappers.<EntrustMaterialCheckoutResult>lambdaQuery()
+                        .eq(StrUtil.isNotBlank(query.getEntrustId()), EntrustMaterialCheckoutResult::getEntrustId, query.getEntrustId())
+                        .orderByDesc(EntrustMaterialCheckoutResult::getUpdateTime)
+        );
+        IPage<EntrustMaterialCheckoutResultVO> voPage = new Page<>();
+        BeanUtils.copyProperties(page, voPage, "records");
+        List<EntrustMaterialCheckoutResult> records = page.getRecords();
+        if (CollUtil.isNotEmpty(records)) {
+            List<EntrustmentIdentificationMaterial> entrustmentIdentificationMaterials = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery().in(EntrustmentIdentificationMaterial::getId, records.stream().map(EntrustMaterialCheckoutResult::getId).collect(Collectors.toSet())));
+            Map<String, EntrustmentIdentificationMaterial> materialMap = entrustmentIdentificationMaterials.stream().collect(Collectors.toMap(EntrustmentIdentificationMaterial::getId, Function.identity()));
+            List<EntrustMaterialCheckoutResultVO> entrustMaterialCheckoutResultVOS = records.stream().map(record -> {
+                EntrustMaterialCheckoutResultVO entrustMaterialCheckoutResultVO = EntrustMaterialCheckoutResultConvert.entityToVO(record);
+                entrustMaterialCheckoutResultVO.setName(materialMap.get(record.getId()).getName());
+                return entrustMaterialCheckoutResultVO;
+            }).collect(Collectors.toList());
+            voPage.setRecords(entrustMaterialCheckoutResultVOS);
+        }
+        return voPage;
+    }
+
    /**
     * 构建并输出Excel文件。
     *
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -3329,6 +3329,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, entrustmentList2.size(), "待受理 (大数据平台)"));
        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, entrustmentList3.size(), String.format("已受理 (%s)", EntrustMarkConstants.PUBLIC_SECURITY_BUREAU)));
        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, entrustmentList4.size(), "已受理 (大数据平台)"));
+        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, this.list(Wrappers.<Entrustment>lambdaQuery().inSql(Entrustment::getId, "SELECT entrust_id FROM b_entrust_material_checkout_result")).size(), "检测结果"));
        markersVOS.add(new MarkersVO(EntrustMarkConstants.REVIEW_OR_APPROVAL,
                this.list(new LambdaQueryWrapper<Entrustment>()
                        .in(Entrustment::getStatus, integers1)
--- a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java
@@ -23,9 +23,15 @@ public class EntrustMaterialCheckoutResultVO {
    /**
     * 委托检材id
     */
-    @ApiModelProperty("委托id")
+    @ApiModelProperty(value = "委托id")
    private String entrustId;

+    /**
+     * 检材名称
+     */
+    @ApiModelProperty(value = "检材名称")
+    private String name;
+
    /**
     * 定性结果
     */
@@ -50,4 +56,7 @@ public class EntrustMaterialCheckoutResultVO {
    @ApiModelProperty("检出结果的备注信息")
    private String checkoutRemark;

+    @ApiModelProperty(value = "委托检材顺序号，由系统根据录入顺序生成")
+    private Integer orderNo;
+
 }
--- a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustmentVO.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustmentVO.java
@@ -2,6 +2,7 @@ package digital.laboratory.platform.entrustment.vo;

 import digital.laboratory.platform.entrustment.entity.Entrustment;
 import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 import java.util.List;
@@ -39,5 +40,11 @@ public class EntrustmentVO extends Entrustment {

    String happenTime;//案发时间

+    @ApiModelProperty("委托关联的检出有多少检出的数量")
+    private Integer checkoutResultCount;
+
+    @ApiModelProperty("委托关联的检出有多少检出信息字符串")
+    private String checkoutResultStr;
+
    private List<EntrustmentIdentificationMaterial> materialList;//检材列表
 }
--- a/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml
+++ b/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml
@@ -6,6 +6,7 @@

    <resultMap id="BaseResultMap" type="digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult">
            <id property="id" column="entrust_material_id" jdbcType="VARCHAR"/>
+            <result property="entrustId" column="entrust_id" jdbcType="VARCHAR"/>
            <result property="qualitativeResult" column="qualitative_result" jdbcType="VARCHAR" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
            <result property="quantitativeResult" column="quantitative_result" jdbcType="VARCHAR"/>
            <result property="otherResult" column="other_result" jdbcType="VARCHAR"/>
@@ -15,14 +16,41 @@
            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
    </resultMap>

+    <resultMap id="EntrustMaterialCheckoutResultVO" type="digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO" extends="BaseResultMap">
+        <result property="name" column ="name"/>
+        <result property="orderNo" column ="order_no"/>
+    </resultMap>
+
    <sql id="Base_Column_List">
-        entrust_material_id,
-        qualitative_result,
-        quantitative_result,
-        other_result,
-        create_time,
-        create_by,
-        update_time,
-        update_by
+        emr.entrust_material_id,
+        emr.entrust_id,
+        emr.qualitative_result,
+        emr.quantitative_result,
+        emr.other_result,
+        emr.create_time,
+        emr.create_by,
+        emr.update_time,
+        emr.update_by
    </sql>
+
+    <sql id="getEntrustMaterialCheckoutResultVO">
+        SELECT
+               <include refid="Base_Column_List"/>,
+            em.name,
+            em.entrustment_id,
+            em.order_no
+        FROM b_entrust_material_checkout_result emr
+        LEFT JOIN b_entrustment_identification_material em
+        ON emr.entrust_material_id = em.id
+    </sql>
+
+    <select id="getEntrustMaterialCheckoutResultVOPage" resultMap="EntrustMaterialCheckoutResultVO" resultType="digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO">
+        <include refid="getEntrustMaterialCheckoutResultVO"/>
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="voList" resultMap="EntrustMaterialCheckoutResultVO" resultType="digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO">
+        <include refid="getEntrustMaterialCheckoutResultVO"/>
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
--- a/src/main/resources/mapper/EntrustmentMapper.xml
+++ b/src/main/resources/mapper/EntrustmentMapper.xml
@@ -147,92 +147,230 @@

  </resultMap>

+  <sql id="BaseColumnList" >
+      e.id,
+      e.case_id,
+      e.entrustment_no,
+      e.third_sys_entrust_no,
+      e.entrustment_type,
+      e.business_type,
+      e.process_instance_id,
+      e.identification_id,
+      e.entrustment_time,
+      e.submitter,
+      e.submit_time,
+      e.client_org_id,
+      e.client_org_name,
+      e.client_address,
+      e.client_postcode,
+      e.client_tel,
+      e.client_fax,
+      e.identification_domain,
+      e.identification_org_name,
+      e.qualitative_analysis,
+      e.quantitative_analysis,
+      e.other_identification_requests,
+      e.candidate_drugs,
+      e.is_client_specified_method,
+      e.client_specified_method,
+      e.destructive_analysis,
+      e.other_identification_notes,
+      e.reidentification,
+      e.old_identification_org_name,
+      e.old_identification_document,
+      e.old_identification_result,
+      e.reidentification_reason,
+      e.avoid_identifier,
+      e.specified_identifier,
+      e.other_agreement,
+      e.comments,
+      e.check_candidate_user,
+      e.check_claim_user,
+      e.check_claim_time,
+      e.check_user,
+      e.check_time,
+      e.check_comments,
+      e.check_times,
+      e.check_all_identification_material_confirmed,
+      e.approve_candidate_user,
+      e.approve_claim_user,
+      e.approve_claim_time,
+      e.approve_user,
+      e.approve_time,
+      e.approve_comments,
+      e.approve_times,
+      e.deliver_confirm_user,
+      e.deliver_confirm_time,
+      e.deliver_confirm_comments,
+      e.deliver_time,
+      e.deliver_submitter,
+      e.deliverer1_name,
+      e.deliverer1_position,
+      e.deliverer1_cert,
+      e.deliverer1_id,
+      e.deliverer1_phone,
+      e.deliverer2_name,
+      e.deliverer2_position,
+      e.deliverer2_cert,
+      e.deliverer2_id,
+      e.deliverer2_phone,
+      e.accept_claim_user,
+      e.accept_claim_time,
+      e.accept_no,
+      e.accept_user,
+      e.accept_time,
+      e.accept_comments,
+      e.identification_items_confirm_printed,
+      e.process_info,
+      e.report_receive_mode,
+      e.report_receiver1_user_id,
+      e.report_receiver1_name,
+      e.report_receiver1_position,
+      e.report_receiver1_cert,
+      e.report_receiver1_id,
+      e.report_receiver1_phone,
+      e.report_receiver2_user_id,
+      e.report_receiver2_name,
+      e.report_receiver2_position,
+      e.report_receiver2_cert,
+      e.report_receiver2_id,
+      e.report_receiver2_phone,
+      e.report_sender_user_id,
+      e.report_sent_time,
+      e.report_receiver1_signature,
+      e.report_receiver2_signature,
+      e.sample_receive_mode,
+      e.sample_receiver1_user_id,
+      e.sample_receiver1_name,
+      e.sample_receiver1_position,
+      e.sample_receiver1_cret,
+      e.sample_receiver1_id,
+      e.sample_receiver1_phone,
+      e.sample_receiver2_user_id,
+      e.sample_receiver2_name,
+      e.sample_receiver2_position,
+      e.sample_receiver2_cret,
+      e.sample_receiver2_id,
+      e.sample_receiver2_phone,
+      e.sample_sender_user_id,
+      e.sample_sent_time,
+      e.sample_receiver1_person_signature,
+      e.sample_receiver2_person_signnature,
+      e.status,
+      e.previous_status,
+      e.create_time,
+      e.create_by,
+      e.update_time,
+      e.update_by,
+      e.entrustment_letter_path,
+      e.identification_items_confirm_path,
+      e.transfer_status,
+      e.transfer_oper_signnature,
+      e.transfer_get_signnature,
+      e.transfer_name,
+      e.transfer_no,
+      e.accept_need_professional,
+      e.data_sources,
+      e.accept_no_third_sys,
+      e.entrust_requirement,
+      e.post_address,
+      e.return_or_not,
+      e.is_trans,
+      e.type
+  </sql>
+
  <sql id="getEntrustmentVOSQL">
-    SELECT e.*,
-           c.case_name,
-           c.case_no,
-           c.case_brief,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.submitter
-           ) AS submitter_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.check_claim_user
-           ) AS check_claim_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.check_user
-           ) AS check_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.approve_claim_user
-           ) AS approve_claim_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.approve_user
-           ) AS approve_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.deliver_confirm_user
-           ) AS deliver_confirm_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.deliver_submitter
-           ) AS deliver_submitter_name,
--            (
--              SELECT user.name
--              FROM dlp_base.sys_user user
--              WHERE user.user_id=e.accept_claim_user
--            ) AS accept_claim_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.accept_user
-           ) AS accept_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.report_sender_user_id
-           ) AS report_sender_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.sample_sender_user_id
-           ) AS sample_sender_user_name,

-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.create_by
-           ) AS create_user_name,
-           (
-             SELECT user.name
-             FROM dlp_base.sys_user user
-             WHERE user.user_id=e.update_by
-           ) AS update_user_name,
+          SELECT
+          <include refid="BaseColumnList"></include>,
+          c.case_name,
+          c.case_no,
+          c.case_brief,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.submitter
+          ) AS submitter_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.check_claim_user
+          ) AS check_claim_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.check_user
+          ) AS check_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.approve_claim_user
+          ) AS approve_claim_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.approve_user
+          ) AS approve_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.deliver_confirm_user
+          ) AS deliver_confirm_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.deliver_submitter
+          ) AS deliver_submitter_name,
+          -- (
+          -- SELECT user.name
+          -- FROM dlp_base.sys_user user
+          -- WHERE user.user_id=e.accept_claim_user
+          -- ) AS accept_claim_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.accept_user
+          ) AS accept_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.report_sender_user_id
+          ) AS report_sender_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.sample_sender_user_id
+          ) AS sample_sender_user_name,

-           (
-             SELECT COUNT(*)
-             FROM b_entrustment_identification_material eim
-             WHERE eim.entrustment_id=e.id
-           ) AS identification_material_count,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.create_by
+          ) AS create_user_name,
+          (
+          SELECT user.name
+          FROM dlp_base.sys_user user
+          WHERE user.user_id=e.update_by
+          ) AS update_user_name,

-           (
-               select identification_no
-               from b_identification i
-               where i.id = e.identification_id
-           ) as identification_no
+          (
+          SELECT COUNT(*)
+          FROM b_entrustment_identification_material eim
+          WHERE eim.entrustment_id=e.id
+          ) AS identification_material_count,
+
+          (
+          select identification_no
+          from b_identification i
+          where i.id = e.identification_id
+          ) as identification_no,
+          (
+          SELECT COUNT(*) FROM b_entrust_material_checkout_result emr WHERE emr.entrust_id = e.id
+          ) AS checkout_result_count
+
+          FROM b_entrustment e
+          LEFT JOIN b_case_event c on e.case_id=c.id

-    FROM b_entrustment e
-           LEFT JOIN b_case_event c on e.case_id=c.id
  </sql>

  <!-- 取委托列表分页 -->
@@ -282,6 +420,9 @@
      where d.id = #{id}
  </select>

-
-
+<!--  根据检材结果获取委托列表  -->
+    <select id="getEntrustmentVOListByResult" resultMap="entrustmentVO">
+      <include refid="getEntrustmentVOSQL"/>
+        LEFT JOIN b_entrust_material_checkout_result emr ON e.id = emr.entrustment_id
+    </select>
 </mapper>