From 6618f439e77479d40fbebac277434e0227f0c293 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Tue, 7 Jan 2025 14:46:36 +0800 Subject: [PATCH] =?UTF-8?q?20250107=20=E6=9B=B4=E6=96=B0=201.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=9F=E6=88=90=E7=9A=84=E9=89=B4=E5=AE=9A=E8=A6=81?= =?UTF-8?q?=E6=B1=82=EF=BC=9A=20=20=201.1.=E5=8E=BB=E6=8E=89=E5=AE=9A?= =?UTF-8?q?=E6=80=A7=E5=88=86=E6=9E=90=E6=A3=80=E6=B5=8B=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=88=86=E6=9E=90=E4=B8=A4=E5=AD=97=20=20=201.2.=E5=9C=A8?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=90=AB=E6=9C=89=E7=9A=84=E6=AF=92=E5=93=81?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E5=8A=A0=E6=88=90=E5=88=86=E4=B8=A4=E5=AD=97?= =?UTF-8?q?=20=20=201.3.=E5=AF=B9=E4=BA=8E=E5=8D=95=E4=B8=AA=E6=A3=80?= =?UTF-8?q?=E6=9D=90=E5=92=8C=E5=A4=9A=E4=B8=AA=E6=A3=80=E6=9D=90=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E7=94=9F=E6=88=90=202.=E6=B7=BB=E5=8A=A0=E9=89=B4?= =?UTF-8?q?=E5=AE=9A=E5=A7=94=E6=89=98=E4=B9=A6=E5=92=8C=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E7=A1=AE=E8=AE=A4=E4=B9=A6=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8F=97=E5=AD=97=E5=8F=B7=E5=B9=B4=E4=BB=BD=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E5=A7=94=E6=89=98=E9=80=81=E6=A3=80=E6=97=B6=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E5=B9=B4=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EntrustmentServiceImpl.java | 73 +++++++++++-------- 1 file changed, 43 insertions(+), 30 deletions(-) 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 b568c27..a0b65f3 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 @@ -49,10 +49,7 @@ import digital.laboratory.platform.sewage.dto.StatisticsDiffStatusJobDTO; import digital.laboratory.platform.sewage.entity.UpdateInfo; import digital.laboratory.platform.sewage.feign.RemoteSewageJobService; import digital.laboratory.platform.sewage.utils.QRCodeUtils; -import digital.laboratory.platform.sys.entity.Deliverer; -import digital.laboratory.platform.sys.entity.DrugLite; -import digital.laboratory.platform.sys.entity.SysOrg; -import digital.laboratory.platform.sys.entity.SysUser; +import digital.laboratory.platform.sys.entity.*; import digital.laboratory.platform.sys.entity.entrustment.Sample; import digital.laboratory.platform.sys.feign.*; import digital.laboratory.platform.sys.vo.entrustment.MarkersVO; @@ -500,6 +497,7 @@ public class EntrustmentServiceImpl extends ServiceImpl materialList) { - Map> retGroup = materialList - .stream() - .collect( - Collectors.groupingBy(item -> - item.getAnalysisOption() + - "_" + - DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs()) - .stream() - .map(DrugLite::getName) - .collect(Collectors.joining("")), - LinkedHashMap::new, // 返回有序map - Collectors.toList()) - ); - StringBuffer retSb = new StringBuffer(); - //先给group排一个序 - List>> orderedDataList = - orderAnalysisOptionAndDrug(retGroup); - //开始构建 - for (Map.Entry> mapping : orderedDataList) { - retSb.append(getNameDesStrForEntrust(mapping.getValue())).append(","); + StringBuilder retSb = new StringBuilder(); + if (materialList.size() == 1) { + EntrustmentIdentificationMaterial material = materialList.get(0); + retSb.append("对检材中是否含有") + .append( + DrugLiteConvert.convertDirtyLiteByJSON( + material.getCandidateDrugs() + ).stream() + .map(DrugLite::getName) + .collect(Collectors.joining("、")) + ) + .append("成分进行") + .append(AnalysisOptionEnums.fromCode(material.getAnalysisOption()).getChineseName()) + .append("检测"); + } else { + Map> retGroup = materialList + .stream() + .collect( + Collectors.groupingBy(item -> + item.getAnalysisOption() + + "_" + + DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs()) + .stream() + .map(DrugLite::getName) + .collect(Collectors.joining("")), + LinkedHashMap::new, // 返回有序map + Collectors.toList()) + ); + //先给group排一个序 + List>> orderedDataList = + orderAnalysisOptionAndDrug(retGroup); + //开始构建 + for (Map.Entry> mapping : orderedDataList) { + retSb.append(getNameDesStrForEntrust(mapping.getValue())).append(","); + } + retSb.delete(retSb.length() - 1, retSb.length()); } - retSb.delete(retSb.length() - 1, retSb.length()); return retSb.toString(); } @@ -897,8 +910,8 @@ public class EntrustmentServiceImpl extends ServiceImpl drugLiteList = JSONArray.parseArray(drugToString, DrugLite.class); +// String drugToString = JSONArray.toJSONString(materialObj.getCandidateDrugs()); + List drugLiteList = DrugLiteConvert.convertDirtyLiteByJSON(materialObj.getCandidateDrugs()); drugLiteList.forEach(item -> { sbDrugDes.append(item.getName()).append("、"); }); @@ -911,7 +924,8 @@ public class EntrustmentServiceImpl extends ServiceImpl dm = BeanMap.create(ev); //ClassUtils.objectToMap(ev); Map dm = ClassUtils.objectToMap(ev); - if (ev.getEntrustmentTime() == null) { ev.setEntrustmentTime(LocalDate.now()); UpdateWrapper updateWrapper = new UpdateWrapper(); @@ -2165,7 +2178,7 @@ public class EntrustmentServiceImpl extends ServiceImpl ems = entrustmentIdentificationMaterialService.getEntrustmentIdentificationMaterialVOList(Wrappers.query() .eq("entrustment_id", ev.getId()).orderByAsc("im_no"));