From 46bc4721aa5868be189598faf2ab0a517f7d66fc Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Thu, 20 Feb 2025 10:44:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?20250220=20=E6=9B=B4=E6=96=B0=201.=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=A3=80=E5=87=BA=E7=BB=93=E6=9E=9C=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E6=A3=80=E6=9D=90=E9=A1=BA=E5=BA=8F=202.=E5=A7=94?= =?UTF-8?q?=E6=89=98=E5=AE=9E=E7=8E=B0=E7=B1=BB=E4=B8=AD=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rustMaterialCheckoutResultServiceImpl.java | 2 +- .../service/impl/EntrustmentServiceImpl.java | 272 ++++++++---------- 2 files changed, 118 insertions(+), 156 deletions(-) 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 99308cf..020a6be 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 @@ -82,7 +82,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl { StringBuilder builder = new StringBuilder(); builder - .append(value.stream().map(item -> materialMap.get(item.getId()).getOrderNo1()).collect(Collectors.joining("、"))) + .append(value.stream().map(item -> materialMap.get(item.getId()).getOrderNo1()).sorted().collect(Collectors.joining("、"))) .append(" : [") .append(key) .append("]"); 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 fbe1ae7..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 @@ -75,6 +75,7 @@ import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.*; import java.math.BigDecimal; +import java.math.RoundingMode; import java.security.Principal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -451,9 +452,9 @@ public class EntrustmentServiceImpl extends ServiceImpl 0) { - return true; - } else { - return false; - } + return item.getSample1Quantity() != null && item.getSample1Quantity().compareTo(BigDecimal.ZERO) > 0; }).collect(Collectors.toList()); List rtList = materialList.stream().filter(item -> { // if(item.getSample2RepeatWeigh()!=null&&item.getSample2RepeatWeigh().compareTo(BigDecimal.ZERO)>0) @@ -574,11 +571,7 @@ public class EntrustmentServiceImpl extends ServiceImpl 0) { - return true; - } else { - return false; - } + return item.getSample2Quantity() != null && item.getSample2Quantity().compareTo(BigDecimal.ZERO) > 0; }).collect(Collectors.toList()); if (flag.equals("A")) { return anList; @@ -605,9 +598,9 @@ public class EntrustmentServiceImpl extends ServiceImpl materialList, String flag) { BigDecimal mount1 = new BigDecimal(0); @@ -676,16 +669,16 @@ public class EntrustmentServiceImpl extends ServiceImpl= 0) { // 如果 totalSampleMass 大于 100，保留 1 位小数 - eg.setTotalSampleDes(totalSampleMass.setScale(1, BigDecimal.ROUND_HALF_UP) + item.getUnit()); + eg.setTotalSampleDes(totalSampleMass.setScale(1, RoundingMode.HALF_UP) + item.getUnit()); } else { // 否则保留 2 位小数 - eg.setTotalSampleDes(totalSampleMass.setScale(2, BigDecimal.ROUND_HALF_UP) + item.getUnit()); + eg.setTotalSampleDes(totalSampleMass.setScale(2, RoundingMode.HALF_UP) + item.getUnit()); } return eg; } private BigDecimal calculateTotalSampleMass(EntrustmentIdentificationMaterial item, MaterialListForBookVo eg) { - BigDecimal totalSampleMass = BigDecimal.ZERO; + BigDecimal totalSampleMass; //因为现在有的检材可以不用复称，例如送来的一支电子烟，所以我们用送检的数量与单位进行描述即可 if (item.getSample1RepeatWeigh() == null || item.getSample1RepeatWeigh().compareTo(BigDecimal.ZERO) == 0) { eg.setAnalysisSampleDes(item.getSample1Quantity() + item.getUnit()); @@ -727,8 +720,8 @@ public class EntrustmentServiceImpl extends ServiceImpl materialList) { @@ -756,11 +749,8 @@ public class EntrustmentServiceImpl extends ServiceImpl materialList) { Map> retGroup = materialList.stream().collect(Collectors.groupingBy(item -> item.getAnalysisOption() + "_" + getDrugNameMsg(item.getCandidateDrugs()))); - List desList = new ArrayList<>(); StringBuffer retSb = new StringBuffer(); - retGroup.forEach((k, v) -> { - retSb.append(getNameDesStr(v)).append(","); - }); + retGroup.forEach((k, v) -> retSb.append(getNameDesStr(v)).append(",")); retSb.delete(retSb.length() - 1, retSb.length()); return retSb.toString(); } @@ -815,7 +805,7 @@ public class EntrustmentServiceImpl extends ServiceImpl>> orderAnalysisOptionAndDrug(Map> targetMapData) { List>> retList = - new ArrayList>>(targetMapData.entrySet()); + new ArrayList<>(targetMapData.entrySet()); Collections.sort(retList, new Comparator>>() { @Override public int compare(Map.Entry> o1, @@ -843,7 +833,7 @@ public class EntrustmentServiceImpl extends ServiceImpl drugLites) { StringBuilder sb = new StringBuilder(); for (DrugLite lite : drugLites) { - DrugLite drugLite = (DrugLite) JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(lite)), DrugLite.class); + DrugLite drugLite = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(lite)), DrugLite.class); sb.append(drugLite.getName()); } return sb.toString(); @@ -854,18 +844,16 @@ public class EntrustmentServiceImpl extends ServiceImpl drugLiteList = DrugLiteConvert.convertDirtyLiteByJSON(materialObj.getCandidateDrugs()); - drugLiteList.forEach(item -> { - sbDrugDes.append(item.getName()).append("、"); - }); + drugLiteList.forEach(item -> sbDrugDes.append(item.getName()).append("、")); sbDrugDes.delete(sbDrugDes.length() - 1, sbDrugDes.length());//删除多余的连接号 sbAnalysisDes.append(AnalysisOptionEnums.fromCode(materialObj.getAnalysisOption()).getChineseName()); } @@ -883,9 +871,9 @@ public class EntrustmentServiceImpl extends ServiceImpl drugLiteList = DrugLiteConvert.convertDirtyLiteByJSON(materialObj.getCandidateDrugs()); - drugLiteList.forEach(item -> { - sbDrugDes.append(item.getName()).append("、"); - }); + drugLiteList.forEach(item -> sbDrugDes.append(item.getName()).append("、")); sbDrugDes.delete(sbDrugDes.length() - 1, sbDrugDes.length());//删除多余的连接号 sbAnalysisDes.append(AnalysisOptionEnums.fromCode(materialObj.getAnalysisOption()).getChineseName()); } @@ -922,18 +908,16 @@ public class EntrustmentServiceImpl extends ServiceImpl { String drugToString = JSONArray.toJSONString(item.getCandidateDrugs()); List drugLiteList = JSONArray.parseArray(drugToString, DrugLite.class); - drugLiteList.forEach(drugLite -> { - allDrugLite.add(drugLite); - }); + allDrugLite.addAll(drugLiteList); }); - retList = allDrugLite.stream().filter(distinctKey(i -> i.getName())).collect(Collectors.toList()); + retList = allDrugLite.stream().filter(distinctKey(DrugLite::getName)).collect(Collectors.toList()); return retList; } /** * 获取文书名称 * - * @param entrustId + * @param entrustId 委托id * @param whatBook entrust-委托书 identItemBook-鉴定事项确认书 identfyBook-鉴定书 * @param docType 该参数只有用于委托书上 * @return @@ -975,8 +959,8 @@ public class EntrustmentServiceImpl extends ServiceImpl fileList = ossFile.fileList(path); - if (fileList.size() > 0) { - return true; - } else { - return false; - } + return !fileList.isEmpty(); } @Override @@ -1048,7 +1028,7 @@ public class EntrustmentServiceImpl extends ServiceImpl 0) { - return true; - } else return false; + return !noWeighMaterialList.isEmpty(); } // @@ -1109,7 +1087,7 @@ public class EntrustmentServiceImpl extends ServiceImpl { @@ -1176,7 +1154,7 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrust.getId()); // 查询条件是 id 相等 updateWrapper.set("client_org_id", entrust.getClientOrgId()); @@ -1270,7 +1248,7 @@ public class EntrustmentServiceImpl extends ServiceImpl imUpdateWrapper = new UpdateWrapper(); + UpdateWrapper imUpdateWrapper = new UpdateWrapper<>(); imUpdateWrapper.eq("entrustment_id", entrustment.getId()); // 查询条件是 entrustment_id 相等 imUpdateWrapper.set("candidate_drugs", entrustment.getCandidateDrugs(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"); entrustmentIdentificationMaterialService.update(null, imUpdateWrapper); @@ -1282,7 +1260,7 @@ public class EntrustmentServiceImpl extends ServiceImpl users = this.taskAvailableUserList_Check(); List users = commonFeignService.remoteGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, CollUtil.newArrayList("EntrustmentCheck")); - String candidateUser = ""; - for (SysUser u : users) { - if (candidateUser.length() > 0) { - candidateUser += ","; - } - candidateUser += u.getUserId(); - } + String candidateUser = users.stream().map(SysUser::getUserId).collect(Collectors.joining(",")); entrustment.setCheckCandidateUser(candidateUser); // 不使用用户提交的候选人名单 } else { if (StrUtil.isBlank(entrust.getCheckCandidateUser())) { @@ -1332,7 +1304,7 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustment.getProcessInfo(); if (pis == null) { - pis = new ArrayList(); + pis = new ArrayList<>(); } UpdateInfo pi = new UpdateInfo(dlpUser.getId(), dlpUser.getName(), @@ -1374,7 +1346,7 @@ public class EntrustmentServiceImpl extends ServiceImpl materialList = entrustmentIdentificationMaterialService.list(Wrappers.query() .eq("entrustment_id", entrustment.getId()) .orderByAsc("create_time")); - if (materialList == null || materialList.size() == 0) { + if (CollUtil.isEmpty(materialList)) { throw new CheckedException("请至少添加一个检材后再提交!"); } if (StrUtil.isBlank(entrust.getEntrustRequirement())) { @@ -1402,7 +1374,7 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等 updateWrapper.set("check_claim_user", entrustment.getCheckClaimUser()); @@ -1502,13 +1474,8 @@ public class EntrustmentServiceImpl extends ServiceImpl users = this.taskAvailableUserList_Approve(); List users = commonFeignService.remoteGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, CollUtil.newArrayList("EntrustmentApprove")); - String candidateUser = ""; - for (SysUser u : users) { - if (candidateUser.length() > 0) { - candidateUser += ","; - } - candidateUser += u.getUserId(); - } + String candidateUser = users.stream().map(SysUser::getUserId).collect(Collectors.joining(",")); + entrustment.setApproveCandidateUser(candidateUser); // 不使用用户提交的候选人名单 } else { if (StrUtil.isBlank(entrust.getApproveCandidateUser())) { @@ -1563,7 +1530,7 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustment.getProcessInfo(); if (pis == null) { - pis = new ArrayList(); + pis = new ArrayList<>(); } if (opCode == 1) { UpdateInfo pi = new UpdateInfo(dlpUser.getId(), @@ -1586,7 +1553,7 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等 updateWrapper.set("destructive_analysis", entrust.getDestructiveAnalysis()); @@ -1656,7 +1623,7 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等 updateWrapper.set("approve_claim_user", entrustment.getApproveClaimUser()); @@ -1708,7 +1675,7 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等 updateWrapper.set("deliver_confirm_user", entrustment.getDeliverConfirmUser()); @@ -1948,11 +1915,11 @@ public class EntrustmentServiceImpl extends ServiceImpl getEntrustDeliverUpdateWrapper(Entrustment entrustment) { - UpdateWrapper updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等 // updateWrapper.set("deliverer1_user_id", entrustment.getDeliverer1UserId()); @@ -1978,7 +1945,7 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustment.getProcessInfo(); if (pis == null) { - pis = new ArrayList(); + pis = new ArrayList<>(); } UpdateInfo pi = new UpdateInfo(dlpUser.getId(), @@ -2021,7 +1988,7 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等 @@ -2067,7 +2034,7 @@ public class EntrustmentServiceImpl extends ServiceImpl dm = ClassUtils.objectToMap(ev); if (ev.getEntrustmentTime() == null) { ev.setEntrustmentTime(LocalDateTime.now()); - UpdateWrapper updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等 updateWrapper.set("entrustment_time", ev.getEntrustmentTime()); @@ -2173,9 +2140,9 @@ public class EntrustmentServiceImpl extends ServiceImpl= 0) { - entrustmentIdentificationMaterial.setQuantity(quantity.setScale(1, BigDecimal.ROUND_HALF_UP)); + entrustmentIdentificationMaterial.setQuantity(quantity.setScale(1, RoundingMode.HALF_UP)); } else { - entrustmentIdentificationMaterial.setQuantity(quantity.setScale(2, BigDecimal.ROUND_HALF_UP)); + entrustmentIdentificationMaterial.setQuantity(quantity.setScale(2, RoundingMode.HALF_UP)); } } dm.put("materialList", materialList); @@ -2216,12 +2183,12 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等 updateWrapper.set("destructive_analysis", entrust.getDestructiveAnalysis()); @@ -2304,11 +2271,11 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustment.getProcessInfo(); if (pis == null) { - pis = new ArrayList(); + pis = new ArrayList<>(); } if (opCode == 1) { UpdateInfo pi = new UpdateInfo(dlpUser.getId(), @@ -2477,27 +2444,25 @@ public class EntrustmentServiceImpl extends ServiceImpl 0) { - List imList = entrustmentIdentificationMaterialService.list(Wrappers.query() - .eq("entrustment_id", entrustment.getId())); - List newSampleList = new ArrayList(); - for (EntrustmentIdentificationMaterial im : imList) { - - List oldSampleList = sampleService.createSample(im, entrustment.getClientOrgId(), dlpUser.getId()); - for (Sample oldSamObj : oldSampleList) { - Sample newSamObj = new Sample(); - BeanUtils.copyProperties(oldSamObj, newSamObj); - newSampleList.add(newSamObj); - } + List imList = entrustmentIdentificationMaterialService.list(Wrappers.query() + .eq("entrustment_id", entrustment.getId())); + List newSampleList = new ArrayList<>(); + for (EntrustmentIdentificationMaterial im : imList) { + + List oldSampleList = sampleService.createSample(im, entrustment.getClientOrgId(), dlpUser.getId()); + for (Sample oldSamObj : oldSampleList) { + Sample newSamObj = new Sample(); + BeanUtils.copyProperties(oldSamObj, newSamObj); + newSampleList.add(newSamObj); } - System.out.println("-------------准备写入远程检材系统的数据量为：" + newSampleList.size()); - //调用流转系统的接口，并将数据写过去 - remoteSampleService.enterSample(newSampleList); } + System.out.println("-------------准备写入远程检材系统的数据量为：" + newSampleList.size()); + //调用流转系统的接口，并将数据写过去 + remoteSampleService.enterSample(newSampleList); } else { isSuccess = false; log.info("大数据平台受理失败 {}", entrustment.getId()); - throw new RuntimeException(String.format("同步受理信息至大数据平台失败，此次受理失败，请从大数据平台重新受理，然后将在本系统已受理页面将委托同步!")); + throw new RuntimeException("同步受理信息至大数据平台失败，此次受理失败，请从大数据平台重新受理，然后将在本系统已受理页面将委托同步!"); } } else { System.out.println("不支持的受理类型参数"); @@ -2505,7 +2470,7 @@ public class EntrustmentServiceImpl extends ServiceImpl imList = entrustmentIdentificationMaterialService.list(Wrappers.query() .eq("entrustment_id", entrustment.getId())); - List newSampleList = new ArrayList(); + List newSampleList = new ArrayList<>(); for (EntrustmentIdentificationMaterial im : imList) { List oldSampleList = sampleService.createSample(im, entrustment.getClientOrgId(), dlpUser.getId()); @@ -2526,7 +2491,7 @@ public class EntrustmentServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等 updateWrapper.set("entrustment_time", ev.getEntrustmentTime()); @@ -2708,7 +2673,7 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustment.getProcessInfo(); if (pis == null) { - pis = new ArrayList(); + pis = new ArrayList<>(); } UpdateInfo pi = new UpdateInfo(dlpUser.getId(), dlpUser.getName(), @@ -2762,12 +2727,12 @@ public class EntrustmentServiceImpl extends ServiceImpl users = new ArrayList(); + List users = new ArrayList<>(); SysUser submitter = remoteUserService.innerGetById(entrustment.getSubmitter()).getData(); users.add(submitter); return R.ok(users); @@ -2955,9 +2920,9 @@ public class EntrustmentServiceImpl extends ServiceImpl entrustmentList = this.list(new LambdaQueryWrapper().eq(Entrustment::getClientOrgId, orgId)); @@ -3020,7 +2985,7 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustmentDTO.getProcessInfo(); if (pis == null) { - pis = new ArrayList(); + pis = new ArrayList<>(); } UpdateInfo pi = new UpdateInfo(dlpUser.getId(), dlpUser.getName(), @@ -3258,7 +3223,7 @@ public class EntrustmentServiceImpl extends ServiceImpl getMarkersForEntrustment() { @@ -3347,7 +3312,7 @@ public class EntrustmentServiceImpl extends ServiceImpl entrustmentIdentificationMaterialList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery() .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId()) .orderByAsc(EntrustmentIdentificationMaterial::getAcceptNo)); - if (entrustmentIdentificationMaterialList.size() > 0) { + if (!entrustmentIdentificationMaterialList.isEmpty()) { if (entrustmentIdentificationMaterialList.size() > 18) { int remainder = entrustmentIdentificationMaterialList.size() % 18; if (remainder != 0) { @@ -3381,10 +3346,9 @@ public class EntrustmentServiceImpl extends ServiceImpl getEntrustmentAndMaterial(Page page, Integer status, String keywords) { IPage voPage = this.getEntrustmentVOPage(page, Wrappers.query() .and(StrUtil.isNotBlank(keywords), wrapper -> wrapper .like("e.entrustment_no", keywords) @@ -3456,9 +3420,7 @@ public class EntrustmentServiceImpl extends ServiceImpl fileName = ossFile.fileList(path); - if (fileName.size() > 0) { - return true; - } else return false; + return !fileName.isEmpty(); } /** @@ -3569,7 +3531,7 @@ public class EntrustmentServiceImpl extends ServiceImpl 0) { + if (CollUtil.isNotEmpty(list)) { Entrustment entrustment = list.get(0); // 获取最新的一条记录 List deliverers = new ArrayList<>(); // 创建一个列表来保存配送员信息 From 1aa2a7a89212c7826085253f3a8d7350ba8de1b2 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Thu, 20 Feb 2025 15:29:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?20250220=20=E6=9B=B4=E6=96=B0=201.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=89=B9=E9=87=8F=E5=8F=97=E7=90=86=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8F=97=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntrustmentIdentificationMaterialController.java | 2 +- .../impl/EntrustmentIdentificationMaterialServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java index 155a898..6a37c79 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java @@ -273,7 +273,7 @@ public class EntrustmentIdentificationMaterialController { /** * 受理人对检材进行受理 * - * @param identificationMaterial + * @param identificationMaterialList * @return */ @ApiOperation(value = "受理人对检材进行受理提交", notes = "受理人对检材进行受理提交, opCode: 1=通过, -1=不通过, 0=未审核\n" + diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java index 84378e2..9951471 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java @@ -720,6 +720,10 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl Date: Thu, 20 Feb 2025 17:06:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?20250220=20=E6=9B=B4=E6=96=B0=201.=E9=80=81?= =?UTF-8?q?=E6=A3=80=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E5=A7=94=E6=89=98?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E5=A7=94?= =?UTF-8?q?=E6=89=98=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=89=B4=E5=AE=9A=E6=83=85=E5=86=B5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=202.=E5=A4=84=E7=90=86=E5=B7=B2=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=9A=84=E5=A7=94=E6=89=98=E5=9C=A8=E6=AC=A1=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E7=94=A8=E6=9F=A5=E7=9C=8B=E6=A3=80?= =?UTF-8?q?=E6=9D=90=E6=8E=A5=E5=8F=A3=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=203.=E5=9B=9E=E6=98=BE=E9=89=B4?= =?UTF-8?q?=E5=AE=9A=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseEventController.java | 4 +-- .../dto/UpdateCaseAndEntrustTypeDTO.java | 10 +++--- .../entrustment/entity/Entrustment.java | 2 +- ...mentIdentificationMaterialServiceImpl.java | 14 +++++--- .../platform/entrustment/vo/CaseEventVO.java | 10 +++--- .../entrustment/vo/EntrustAlterApplyVO.java | 5 +++ src/main/resources/mapper/CaseEventMapper.xml | 34 +++++++++++-------- .../mapper/EntrustAlterApplyMapper.xml | 3 +- 8 files changed, 47 insertions(+), 35 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java index 9555649..57ea8e1 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java @@ -96,7 +96,7 @@ public class CaseEventController { Entrustment one = entrustmentService.getOne(Wrappers.lambdaQuery().eq(Entrustment::getCaseId, id)); cevo.setEntrustmentType(one.getEntrustmentType()); -// cevo.setType(one.getType()); + cevo.setOldIdentificationResult(one.getOldIdentificationResult()); return R.ok(cevo); } @@ -242,7 +242,7 @@ public class CaseEventController { entrustmentService.update(Wrappers.lambdaUpdate() .eq(Entrustment::getId, dto.getEntrustId()) .set(Entrustment::getEntrustmentType, dto.getEntrustmentType()) -// .set(StrUtil.isNotBlank(dto.getType()), Entrustment::getType, dto.getType()) + .set(StrUtil.isNotBlank(dto.getOldIdentificationResult()), Entrustment::getOldIdentificationResult, dto.getOldIdentificationResult()) ); } return R.ok(caseEvent, "保存案件信息成功"); diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java index 1bb785e..7098c4f 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java @@ -97,10 +97,8 @@ public class UpdateCaseAndEntrustTypeDTO { @ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本") private Integer entrustmentType; - /** - * 20250121 新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分 - * 存字符串，不用code表达 - */ - @ApiModelProperty("新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分") - private String type; + @ApiModelProperty(value="原鉴定结果（鉴定情况），" + + "常规毒品：首次鉴定、初筛（不要报告、只要结果）、补充鉴定、重新鉴定；" + + "生物样本：首次鉴定、初筛（不要报告、只要结果）、涉缅人员、自愿戒治人员、补充鉴定、重新鉴定") + private String oldIdentificationResult; } diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java index 016e6cc..40ca46e 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java @@ -214,7 +214,7 @@ public class Entrustment extends BaseEntity { /** * 原鉴定结果 */ - @ApiModelProperty(value="原鉴定结果，" + + @ApiModelProperty(value="原鉴定结果（鉴定情况），" + "常规毒品：首次鉴定、初筛（不要报告、只要结果）、补充鉴定、重新鉴定；" + "生物样本：首次鉴定、初筛（不要报告、只要结果）、涉缅人员、自愿戒治人员、补充鉴定、重新鉴定") private String oldIdentificationResult; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java index 9951471..c51cec2 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java @@ -517,6 +517,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl= 0) { + return null; + } + if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) { throw new RuntimeException("委托不在待审核状态"); } @@ -780,10 +785,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl diff --git a/src/main/resources/mapper/EntrustAlterApplyMapper.xml b/src/main/resources/mapper/EntrustAlterApplyMapper.xml index fa806d0..2108dae 100644 --- a/src/main/resources/mapper/EntrustAlterApplyMapper.xml +++ b/src/main/resources/mapper/EntrustAlterApplyMapper.xml @@ -35,7 +35,8 @@ eaa.*, ce.case_name, ce.id as case_id, - e.entrustment_type + e.entrustment_type, + e.old_identification_result FROM b_entrust_alter_apply eaa LEFT JOIN b_entrustment e ON eaa.entrust_id = e.id From 89d25b990d9fad088932255fef32abcc865c72d9 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Tue, 25 Feb 2025 18:00:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?20250225=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EntrustmentController.java | 2 +- ...tmentIdentificationMaterialController.java | 14 ++++- .../entrustment/convert/DrugLiteConvert.java | 6 +- .../EntrustMaterialCheckoutResultConvert.java | 12 +++- .../entity/EntrustMaterialCheckoutResult.java | 4 +- .../entrustment/entity/Entrustment.java | 9 +-- .../EntrustMaterialCheckoutResultMapper.java | 2 +- ...rustMaterialCheckoutResultServiceImpl.java | 60 +++++++++++-------- .../service/impl/EntrustmentServiceImpl.java | 2 +- .../vo/EntrustMaterialCheckoutResultVO.java | 11 +++- .../EntrustMaterialCheckoutResultMapper.xml | 11 +++- .../resources/mapper/EntrustmentMapper.xml | 6 +- 12 files changed, 92 insertions(+), 47 deletions(-) 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 bb33a43..59cf7e6 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/controller/EntrustmentIdentificationMaterialController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java index 6a37c79..e3bc5fd 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java @@ -672,15 +672,21 @@ public class EntrustmentIdentificationMaterialController { @PreAuthorize("@pms.hasPermission('EntrustmentAccept')") public R uploadAcceptAttachmentObj(@PathVariable("identificationMaterialId") String identificationMaterialId, @RequestPart("file") MultipartFile file) throws Exception { EntrustmentIdentificationMaterial im = entrustmentIdentificationMaterialService.getById(identificationMaterialId); + String entrustId = im.getEntrustmentId(); if (im != null) { if (im.getAcceptPassed() == null || im.getAcceptPassed() != 1) { - System.out.println(String.format("uploadAcceptAttachmentObj: entrustmentId=%s identificationMaterialId=%s OriginalFilename=%s", im.getEntrustmentId(), identificationMaterialId, file.getOriginalFilename())); - String path = OSSDirectoryConstants.ACCEPT_DIRECTORY + "/" + im.getEntrustmentId() + "/" + identificationMaterialId; + System.out.println(String.format("uploadAcceptAttachmentObj: entrustmentId=%s identificationMaterialId=%s OriginalFilename=%s", entrustId, identificationMaterialId, file.getOriginalFilename())); + String path = OSSDirectoryConstants.ACCEPT_DIRECTORY + "/" + entrustId + "/" + identificationMaterialId; boolean r = ossFile.fileUpload(file, path); Map ResultData = new HashMap<>(); ResultData.put("fileName", FileNameUtil.getName(file.getOriginalFilename())); ResultData.put("path", path); if (r) { + Entrustment entrust = entrustmentService.getById(entrustId); + if (!entrust.getMaterialImageFlag()) { + // 如果该委托并上传检材照片则更新 + entrustmentService.update(Wrappers.lambdaUpdate().eq(Entrustment::getId, entrustId).set(Entrustment::getMaterialImageFlag, Boolean.TRUE)); + } return R.ok(ResultData, "上传成功"); } return R.failed("上传失败"); @@ -741,6 +747,10 @@ public class EntrustmentIdentificationMaterialController { boolean r = ossFile.fileSave(path + "/" + fileName, is); if (r) { Thread.sleep(10); + if (!entrustObj.getMaterialImageFlag()) { + // 如果该委托并上传检材照片则更新 + entrustmentService.update(Wrappers.lambdaUpdate().eq(Entrustment::getId, entrustId).set(Entrustment::getMaterialImageFlag, Boolean.TRUE)); + } return R.ok(ResultData, "上传成功"); } return R.failed("上传失败"); diff --git a/src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java b/src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java index fc1379e..bc90a70 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java +++ b/src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java @@ -23,7 +23,11 @@ public class DrugLiteConvert { return Collections.emptyList(); } String drugToString = JSONArray.toJSONString(drugLitesJson); - List drugLiteList = JSONArray.parseArray(drugToString, DrugLite.class).stream().sorted(Comparator.comparing(DrugLite::getName)).collect(Collectors.toList());; + return getDrugLites(drugToString); + } + + public static List getDrugLites(String drugToString) { + List drugLiteList = JSONArray.parseArray(drugToString, DrugLite.class).stream().sorted(Comparator.comparing(DrugLite::getName)).collect(Collectors.toList()); return drugLiteList; } 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 395eee5..d11fb45 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustMaterialCheckoutResultConvert.java +++ b/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustMaterialCheckoutResultConvert.java @@ -1,9 +1,13 @@ package digital.laboratory.platform.entrustment.convert; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import digital.laboratory.platform.entrustment.dto.EntrustMaterialCheckoutResultDTO; import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult; import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO; +import digital.laboratory.platform.sys.entity.DrugLite; import java.util.stream.Collectors; @@ -15,7 +19,11 @@ public class EntrustMaterialCheckoutResultConvert { public static EntrustMaterialCheckoutResult dtoToEntity(EntrustMaterialCheckoutResultDTO dto) { if (dto == null) return null; EntrustMaterialCheckoutResult entrustMaterialCheckoutResult = new EntrustMaterialCheckoutResult(); - entrustMaterialCheckoutResult.setQualitativeResult(dto.getQualitativeResult()); + if (CollUtil.isNotEmpty(dto.getQualitativeResult())) { + entrustMaterialCheckoutResult.setQualitativeResult(JSON.toJSONString(dto.getQualitativeResult())); + } else { + entrustMaterialCheckoutResult.setQualitativeResult(null); + } entrustMaterialCheckoutResult.setQuantitativeResult(dto.getQuantitativeResult().stream().collect(Collectors.joining("、"))); entrustMaterialCheckoutResult.setOtherResult(dto.getOtherResult()); entrustMaterialCheckoutResult.setCheckoutRemark(dto.getCheckoutRemark()); @@ -28,7 +36,7 @@ public class EntrustMaterialCheckoutResultConvert { EntrustMaterialCheckoutResultVO vo = new EntrustMaterialCheckoutResultVO(); vo.setId(entity.getId()); vo.setQualitativeResult(entity.getQualitativeResult()); - vo.setQuantitativeResult(StrUtil.split(entity.getQuantitativeResult(), "、")); + vo.setQuantitativeResult(entity.getQuantitativeResult()); vo.setOtherResult(entity.getOtherResult()); vo.setCheckoutRemark(entity.getCheckoutRemark()); return vo; diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialCheckoutResult.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialCheckoutResult.java index fac6271..a93da34 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialCheckoutResult.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialCheckoutResult.java @@ -35,8 +35,8 @@ public class EntrustMaterialCheckoutResult extends BaseEntity { /** * 定性结果 */ - @TableField(typeHandler = FastjsonTypeHandler.class) - private List qualitativeResult; +// @TableField(typeHandler = FastjsonTypeHandler.class) + private String qualitativeResult; /** * 定量结果 diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java index 40ca46e..6e34684 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java @@ -748,12 +748,7 @@ public class Entrustment extends BaseEntity { @ApiModelProperty(value="是否退回（0：未退回，-1：已退回）") private Integer returnOrNot; -// /** -// * 20250121 新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分 -// * 存字符串，不用code表达 -// */ -// @ApiModelProperty("新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分") -// private String type; - + @ApiModelProperty("标记该委托是否已经上传了检材照片, 默认false") + private Boolean materialImageFlag = false; } diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java index 2ea65e2..953d257 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java @@ -23,7 +23,7 @@ import java.util.List; @Mapper public interface EntrustMaterialCheckoutResultMapper extends BaseMapper { - IPage getEntrustMaterialCheckoutResultVOPage(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage getEntrustMaterialCheckoutResultVOPage(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper qw); List voList(@Param(Constants.WRAPPER) Wrapper qw); 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 020a6be..3ab8550 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 @@ -67,27 +67,34 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl materialList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId)); - Map materialMap = materialList.stream().collect(Collectors.toMap(EntrustmentIdentificationMaterial::getId, Function.identity())); +// List materialList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId)); +// Map materialMap = materialList.stream().collect(Collectors.toMap(EntrustmentIdentificationMaterial::getId, Function.identity())); // 获取检测结果 - List checkoutResultList = super.list(Wrappers.lambdaQuery().eq(EntrustMaterialCheckoutResult::getEntrustId, entrustId)); + List checkoutResultList = baseMapper.voList(Wrappers.query().eq("emr.entrust_id", entrustId)); if (CollUtil.isEmpty(checkoutResultList)) { return ""; } + List 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 resultStrList = new ArrayList<>(); // 对检测结果进行分组 - Map> checkoutResultGroupMap = checkoutResultList.stream().collect(Collectors.groupingBy(item -> DrugLiteConvert.joiningDrugListNameToStr(item.getQualitativeResult(), "、"))); + Map> checkoutResultGroupMap = materialCheckoutResults.stream().collect(Collectors.groupingBy(item -> DrugLiteConvert.joiningDrugListNameToStr(DrugLiteConvert.getDrugLites(item.getQualitativeResult()), "、"))); checkoutResultGroupMap.forEach((key, value) -> { StringBuilder builder = new StringBuilder(); builder - .append(value.stream().map(item -> materialMap.get(item.getId()).getOrderNo1()).sorted().collect(Collectors.joining("、"))) + .append(value.stream().map(item -> item.getOrderNo() + "号检材").sorted().collect(Collectors.joining("、"))) .append(" : [") .append(key) .append("]"); resultStrList.add(builder.toString()); }); + 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; + } return resultStrList.stream().sorted().collect(Collectors.joining("\n")); } @@ -188,26 +195,31 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl voiPage(EntrustMaterialCheckoutResultQuery query) { - IPage page = this.page( +// IPage page = this.page( +// new Page<>(query.getCurrent(), query.getSize()), +// Wrappers.lambdaQuery() +// .eq(StrUtil.isNotBlank(query.getEntrustId()), EntrustMaterialCheckoutResult::getEntrustId, query.getEntrustId()) +// .orderByDesc(EntrustMaterialCheckoutResult::getUpdateTime) +// ); +// IPage voPage = new Page<>(); +// BeanUtils.copyProperties(page, voPage, "records"); +// List records = page.getRecords(); +// if (CollUtil.isNotEmpty(records)) { +// List entrustmentIdentificationMaterials = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery().in(EntrustmentIdentificationMaterial::getId, records.stream().map(EntrustMaterialCheckoutResult::getId).collect(Collectors.toSet()))); +// Map materialMap = entrustmentIdentificationMaterials.stream().collect(Collectors.toMap(EntrustmentIdentificationMaterial::getId, Function.identity())); +// List 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 baseMapper.getEntrustMaterialCheckoutResultVOPage( new Page<>(query.getCurrent(), query.getSize()), - Wrappers.lambdaQuery() - .eq(StrUtil.isNotBlank(query.getEntrustId()), EntrustMaterialCheckoutResult::getEntrustId, query.getEntrustId()) - .orderByDesc(EntrustMaterialCheckoutResult::getUpdateTime) + Wrappers.query() + .eq(StrUtil.isNotBlank(query.getEntrustId()), "emr.entrust_id", query.getEntrustId()) + .orderByAsc("em.order_no") ); - IPage voPage = new Page<>(); - BeanUtils.copyProperties(page, voPage, "records"); - List records = page.getRecords(); - if (CollUtil.isNotEmpty(records)) { - List entrustmentIdentificationMaterials = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery().in(EntrustmentIdentificationMaterial::getId, records.stream().map(EntrustMaterialCheckoutResult::getId).collect(Collectors.toSet()))); - Map materialMap = entrustmentIdentificationMaterials.stream().collect(Collectors.toMap(EntrustmentIdentificationMaterial::getId, Function.identity())); - List 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; } /** @@ -315,7 +327,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpllambdaQuery().inSql(Entrustment::getId, "SELECT entrust_id FROM b_entrust_material_checkout_result")).size(), "检测结果")); + markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, entrustmentList3.size(), "检测结果")); markersVOS.add(new MarkersVO(EntrustMarkConstants.REVIEW_OR_APPROVAL, this.list(new LambdaQueryWrapper() .in(Entrustment::getStatus, integers1) diff --git a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java index 75cbe6a..b16dd45 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java @@ -1,5 +1,8 @@ package digital.laboratory.platform.entrustment.vo; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import digital.laboratory.platform.sys.entity.DrugLite; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -20,6 +23,9 @@ public class EntrustMaterialCheckoutResultVO { @ApiModelProperty("委托检材id列表， 支持批量") private String id; + @ApiModelProperty(value = "检材受理编号") + private String acceptNo; + /** * 委托检材id */ @@ -36,13 +42,14 @@ public class EntrustMaterialCheckoutResultVO { * 定性结果 */ @ApiModelProperty("定性结果") - private List qualitativeResult; + private String qualitativeResult; + /** * 定量结果 */ @ApiModelProperty("定量结果") - private List quantitativeResult; + private String quantitativeResult; /** * 其他鉴定结果 diff --git a/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml b/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml index 4ace1f5..38fb42c 100644 --- a/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml +++ b/src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml @@ -7,9 +7,10 @@ - + + @@ -18,6 +19,7 @@ + @@ -35,9 +37,14 @@ SELECT - , + emr.entrust_material_id, + emr.entrust_id, + emr.qualitative_result, + emr.quantitative_result, + emr.other_result, em.name, em.entrustment_id, + em.accept_no, em.order_no FROM b_entrust_material_checkout_result emr LEFT JOIN b_entrustment_identification_material em diff --git a/src/main/resources/mapper/EntrustmentMapper.xml b/src/main/resources/mapper/EntrustmentMapper.xml index 0b06cd0..5a054f3 100644 --- a/src/main/resources/mapper/EntrustmentMapper.xml +++ b/src/main/resources/mapper/EntrustmentMapper.xml @@ -121,6 +121,7 @@ + @@ -274,7 +275,8 @@ e.entrust_requirement, e.post_address, e.return_or_not, - e.is_trans + e.is_trans, + e.material_image_flag @@ -363,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 + SELECT COUNT(*) FROM b_entrust_material_checkout_result emr WHERE emr.entrust_id = e.id AND qualitative_result != '' AND qualitative_result IS NOT NULL ) AS checkout_result_count FROM b_entrustment e