From 9b8e61c50889e982c85e36576dfb3fd401d00f59 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Thu, 27 Feb 2025 10:05:19 +0800 Subject: [PATCH] =?UTF-8?q?20250227=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntrustMaterialCheckoutResultController.java | 3 ++- .../entrustment/controller/EntrustmentController.java | 2 +- .../convert/EntrustMaterialCheckoutResultConvert.java | 2 +- .../dto/EntrustMaterialCheckoutResultDTO.java | 11 +++-------- .../EntrustMaterialCheckoutResultServiceImpl.java | 7 ++++--- .../service/impl/EntrustmentServiceImpl.java | 2 +- .../mapper/EntrustMaterialCheckoutResultMapper.xml | 2 ++ src/main/resources/mapper/EntrustmentMapper.xml | 2 +- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java index a19bade..a8e1ecc 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; import java.util.List; @@ -46,7 +47,7 @@ public class EntrustMaterialCheckoutResultController { @ApiOperation("保存检出得定性定量结果") @PostMapping("/save") - public R save(@RequestBody EntrustMaterialCheckoutResultDTO dto) { + public R save(@RequestBody @Valid EntrustMaterialCheckoutResultDTO dto) { boolean success = false; try { success = entrustMaterialCheckoutResultService.save(dto); diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java index 59cf7e6..bb33a43 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java @@ -190,7 +190,7 @@ 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 的委托 + .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)") diff --git a/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustMaterialCheckoutResultConvert.java b/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustMaterialCheckoutResultConvert.java index d11fb45..c42a9fb 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustMaterialCheckoutResultConvert.java +++ b/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustMaterialCheckoutResultConvert.java @@ -24,7 +24,7 @@ public class EntrustMaterialCheckoutResultConvert { } else { entrustMaterialCheckoutResult.setQualitativeResult(null); } - entrustMaterialCheckoutResult.setQuantitativeResult(dto.getQuantitativeResult().stream().collect(Collectors.joining("、"))); + entrustMaterialCheckoutResult.setQuantitativeResult(dto.getQuantitativeResult()); entrustMaterialCheckoutResult.setOtherResult(dto.getOtherResult()); entrustMaterialCheckoutResult.setCheckoutRemark(dto.getCheckoutRemark()); return entrustMaterialCheckoutResult; diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustMaterialCheckoutResultDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustMaterialCheckoutResultDTO.java index c174ec5..22b0baf 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustMaterialCheckoutResultDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustMaterialCheckoutResultDTO.java @@ -1,17 +1,11 @@ package digital.laboratory.platform.entrustment.dto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -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.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -25,6 +19,7 @@ public class EntrustMaterialCheckoutResultDTO { * 委托检材id */ @ApiModelProperty("委托检材id列表， 支持批量") + @NotEmpty(message = "请选择设置的委托检材！") private List ids; /** @@ -43,7 +38,7 @@ public class EntrustMaterialCheckoutResultDTO { * 定量结果 */ @ApiModelProperty("定量结果") - private List quantitativeResult; + private String quantitativeResult; /** * 其他鉴定结果 diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java index 3ab8550..de03352 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java @@ -76,7 +76,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl materialCheckoutResults = checkoutResultList.stream().filter(o -> StrUtil.isNotBlank(o.getQualitativeResult())).collect(Collectors.toList()); - List materialNotCheckoutResults = checkoutResultList.stream().filter(o -> StrUtil.isEmpty(o.getQualitativeResult())).collect(Collectors.toList()); + List materialNotCheckoutResults = checkoutResultList.stream().filter(o -> StrUtil.isBlank(o.getQualitativeResult())).collect(Collectors.toList()); List resultStrList = new ArrayList<>(); // 对检测结果进行分组 @@ -91,11 +91,12 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl sortedResult = resultStrList.stream().sorted().collect(Collectors.toList()); if (CollUtil.isNotEmpty(materialNotCheckoutResults)) { String notCheckoutStr = materialNotCheckoutResults.stream().map(result -> result.getOrderNo() + "号检材").sorted().collect(Collectors.joining("、")) + materialNotCheckoutResults.get(0).getCheckoutRemark(); - return resultStrList.stream().sorted().collect(Collectors.joining("\n")) + notCheckoutStr; + sortedResult.add(notCheckoutStr); } - return resultStrList.stream().sorted().collect(Collectors.joining("\n")); + return sortedResult.stream().collect(Collectors.joining("\n")); } /** diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index fdfe928..d4460db 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -3268,7 +3268,7 @@ public class EntrustmentServiceImpl extends ServiceImpllambdaQuery().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() .in(Entrustment::getStatus, integers1) diff --git a/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml b/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml index 38fb42c..c1d24bc 100644 --- a/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml +++ b/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml @@ -29,6 +29,7 @@ emr.qualitative_result, emr.quantitative_result, emr.other_result, + emr.checkout_remark, emr.create_time, emr.create_by, emr.update_time, @@ -42,6 +43,7 @@ emr.qualitative_result, emr.quantitative_result, emr.other_result, + emr.checkout_remark, em.name, em.entrustment_id, em.accept_no, diff --git a/src/main/resources/mapper/EntrustmentMapper.xml b/src/main/resources/mapper/EntrustmentMapper.xml index 0503d57..df5ca31 100644 --- a/src/main/resources/mapper/EntrustmentMapper.xml +++ b/src/main/resources/mapper/EntrustmentMapper.xml @@ -365,7 +365,7 @@ where i.id = e.identification_id ) as identification_no, ( - SELECT COUNT(*) FROM b_entrust_material_checkout_result emr WHERE emr.entrust_id = e.id AND qualitative_result != '' AND qualitative_result IS NOT NULL + SELECT COUNT(*) FROM b_entrust_material_checkout_result emr WHERE emr.entrust_id = e.id ) AS checkout_result_count FROM b_entrustment e