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 a6e1d1a..823c764 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java +++ b/src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java @@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONArray; import digital.laboratory.platform.sys.entity.DrugLite; import java.util.Collections; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; /** * 毒品概要实体 转换类 @@ -21,7 +23,7 @@ public class DrugLiteConvert { return Collections.emptyList(); } String drugToString = JSONArray.toJSONString(drugLitesJson); - List drugLiteList = JSONArray.parseArray(drugToString, DrugLite.class); + 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/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java index ed969d3..c5af0f8 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 @@ -1511,8 +1511,8 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl candidateDrugs = material.getCandidateDrugs(); String drugsValue = ""; 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 a0b65f3..2e85967 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 @@ -485,7 +485,7 @@ public class EntrustmentServiceImpl extends ServiceImpl generateIdentifyItemsData(CaseEvent caseEvent, Entrustment entrustment, List materialList, int isAccepted) { @@ -797,8 +797,8 @@ public class EntrustmentServiceImpl extends ServiceImpl>> orderedDataList = - orderAnalysisOptionAndDrug(retGroup); - //开始构建 - for (Map.Entry> mapping : orderedDataList) { - retSb.append(getNameDesStrForEntrust(mapping.getValue())).append(","); + if (retGroup.keySet().size() == 1) { + EntrustmentIdentificationMaterial material = materialList.get(0); + retSb.append("对1号至") + .append(materialList.size()) + .append("号检材中是否含有") + .append(DrugLiteConvert.convertDirtyLiteByJSON( + material.getCandidateDrugs() + ).stream() + .map(DrugLite::getName) + .collect(Collectors.joining("、"))); + retSb.append("成分进行") + .append(AnalysisOptionEnums.fromCode(material.getAnalysisOption()).getChineseName()) + .append("检测"); + return retSb.toString(); + } else { + //先给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(); } @@ -1988,6 +2004,7 @@ public class EntrustmentServiceImpl extends ServiceImpl