From 8d7bf672328d8eeb1928182842decda0592f4144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?= <11918452+yang-haihang@user.noreply.gitee.com> Date: Wed, 2 Apr 2025 15:55:09 +0800 Subject: [PATCH] update --- .../controller/IdentifyBookController.java | 9 +- .../impl/IdentifyBookDataServiceImpl.java | 216 ++++++++++-------- 2 files changed, 123 insertions(+), 102 deletions(-) diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java index bbf2d0f..830cff8 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/IdentifyBookController.java @@ -24,20 +24,23 @@ import java.util.List; public class IdentifyBookController { @Resource private IdentifyBookDataService identifyBookDataService; + //对文书系统提供获取实验数据 @GetMapping("/getIdentifyBookDataByBusinessId") @ApiOperation(value = "获取检验数据") - public R getIdentifyBookDataByBusinessId(String businessId){ + public R getIdentifyBookDataByBusinessId(String businessId) { try { - return R.ok(identifyBookDataService.getIdentifyBookDataByBusinessId(businessId),"构建数据成功"); + return R.ok(identifyBookDataService.getIdentifyBookDataByBusinessId(businessId), "构建数据成功"); } catch (Exception e) { + e.printStackTrace(); return R.failed("获取检验数据失败！"); } } + @PostMapping("/getTestFinishBusinessData") @ApiOperation(value = "获取待制作文书列表") - public R getTestFinishBusinessData(@RequestBody List synedIdList){ + public R getTestFinishBusinessData(@RequestBody List synedIdList) { return identifyBookDataService.getTestFinishBusinessData(synedIdList); } } diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java index 3999166..e1959fa 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/IdentifyBookDataServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -45,13 +46,14 @@ public class IdentifyBookDataServiceImpl implements IdentifyBookDataService { /** * 获取完成实验的数据/获取符合制作文书的数据 + * * @return */ @Override public R getTestFinishBusinessData(List synedIdList) { List entrustInfoList = entrustInfoService.list(Wrappers.lambdaQuery() .ge(EntrustInfo::getStatus, 3) - .notIn(CollectionUtils.isNotEmpty(synedIdList),EntrustInfo::getId,synedIdList)); + .notIn(CollectionUtils.isNotEmpty(synedIdList), EntrustInfo::getId, synedIdList)); if (CollUtil.isNotEmpty(entrustInfoList)) { Map> sampleGroupByBusinessId = sampleInfoService .list(Wrappers.lambdaQuery() @@ -67,42 +69,49 @@ public class IdentifyBookDataServiceImpl implements IdentifyBookDataService { entrustInfo.setMaterialNum(sampleInfos.size()); } } - return R.ok(entrustInfoList,"获取数据成功"); + return R.ok(entrustInfoList, "获取数据成功"); } + /** * 获取文书的数据 + * * @param businessId * @return */ @Override public IdentificationBookDTO getIdentifyBookDataByBusinessId(String businessId) { //一个委托案件，只能属于一个实验，不允许一个委托中的检材分配到2个实验中做实验，这个是前提 - if(ObjectUtils.isNotEmpty(businessId)){ + if (ObjectUtils.isNotEmpty(businessId)) { IdentificationBookDTO identificationBookDTO = buildBookDataDetail(businessId); return identificationBookDTO; - }else { - log.info("参数业务id不能为空，请检查参数{}",businessId); + } else { + log.info("参数业务id不能为空，请检查参数{}", businessId); return null; } } + //构建文书数据 - private IdentificationBookDTO buildBookDataDetail(String businessId){ - IdentificationBookDTO bookData=new IdentificationBookDTO(); + private IdentificationBookDTO buildBookDataDetail(String businessId) { + IdentificationBookDTO bookData = new IdentificationBookDTO(); //委托信息 EntrustInfo entrustInfo = entrustInfoService.getById(businessId); bookData.setEntrustInfo(entrustInfo); //检材 - List sampleList= sampleInfoService.list(Wrappers.lambdaQuery() + List sampleList = sampleInfoService.list(Wrappers.lambdaQuery() .eq(SampleInfo::getBusinessId, businessId).orderByAsc(SampleInfo::getAcceptNo)); bookData.setSampleInfoList(sampleList); //设置检验结果 - List testRecordSampleSolutionList = getTestRecordSampleSolution(sampleList);//样本溶液 List testRecordSampleDataList = getTestRecordSampleData(sampleList);//样本溶液对应的数据 - List testResultsList = buildTestResult(testRecordSampleDataList, testRecordSampleSolutionList, sampleList);//构建检验结果 - TestRecord testRecordInfo = getTestRecordInfo(testRecordSampleSolutionList); + if (CollUtil.isEmpty(testRecordSampleDataList)) { + return null; + } + List testResultsList = buildTestResult(testRecordSampleDataList, sampleList);//构建检验结果 + TestRecord testRecordInfo = testRecordService.lambdaQuery() + .eq(TestRecord::getBusinessId, businessId) + .one(); //实验信息 - bookData.setTestMethod(getTestMethods(testRecordSampleSolutionList));//设置用到的实验方法 + bookData.setTestMethod(getTestMethods(testRecordInfo));//设置用到的实验方法 //设置检验过程 bookData.setTestProcessDes(testRecordInfo.getTestProcessDes());//设置检验过程 bookData.setTestResult(testRecordSampleDataService.generateQualitativeResults(businessId)); @@ -115,46 +124,51 @@ public class IdentifyBookDataServiceImpl implements IdentifyBookDataService { bookData.setTestFinishDate(sdf.format(testRecordInfo.getUpdateTime())); return bookData; } + //获取业务的实验对象 - private TestRecord getTestRecordInfo(List testRecordSampleSolutionList){ - List testIdList= testRecordSampleSolutionList.stream().map(s -> s.getTestId()).collect(Collectors.toList()); - List distinctTestId= testIdList.stream().distinct().collect(Collectors.toList());//去重复 - if(distinctTestId.size()!=1){ + private TestRecord getTestRecordInfo(List testRecordSampleSolutionList) { + List testIdList = testRecordSampleSolutionList.stream().map(s -> s.getTestId()).collect(Collectors.toList()); + List distinctTestId = testIdList.stream().distinct().collect(Collectors.toList());//去重复 + if (distinctTestId.size() != 1) { throw new RuntimeException("一个案件中的检材只能允许分配到一个实验中去做"); } - String testId= distinctTestId.get(0); - TestRecord testRecord= testRecordService.getById(testId); + String testId = distinctTestId.get(0); + TestRecord testRecord = testRecordService.getById(testId); return testRecord; } + //获取实验方法 - private String getTestMethods(List testRecordSampleSolutionList){ - TestRecord testRecordInfo= getTestRecordInfo(testRecordSampleSolutionList); - List testMethodList= testRecordInfo.getTestMethodList(); + private String getTestMethods(TestRecord testRecordInfo) { + List testMethodList = testRecordInfo.getTestMethodList(); + if (CollUtil.isEmpty(testMethodList)) { + return "暂未找到实验过程中的方法数据!"; + } List methodsList = testRecordMethodService.list(Wrappers.lambdaQuery() .in(TestRecordMethod::getId, testMethodList)); List methodsName = methodsList.stream().map(s -> s.getMethodName()).collect(Collectors.toList()); - StringBuffer sbMethodNameStr=new StringBuffer(); - methodsName.forEach(item->{ + StringBuffer sbMethodNameStr = new StringBuffer(); + methodsName.forEach(item -> { sbMethodNameStr.append(item).append(","); }); - sbMethodNameStr.delete(sbMethodNameStr.length()-1,sbMethodNameStr.length()); + sbMethodNameStr.delete(sbMethodNameStr.length() - 1, sbMethodNameStr.length()); return sbMethodNameStr.toString(); } + //获取sampleData - private List getTestRecordSampleData(List sampleInfoList){ - List testRecordSampleSolution = getTestRecordSampleSolution(sampleInfoList); - if (CollUtil.isNotEmpty(testRecordSampleSolution)) { - List sampleNoList= testRecordSampleSolution.stream().map(m -> m.getSampleNo()).collect(Collectors.toList());//得到样本溶液编号 + private List getTestRecordSampleData(List sampleInfoList) { + if (CollUtil.isNotEmpty(sampleInfoList)) { + List sampleNoList = sampleInfoList.stream().map(m -> m.getAcceptNo()).collect(Collectors.toList());//得到样本溶液编号 //根据样本溶液编号查出对应的样本溶液检验数据 - List sampleTestDataList= getTestRecordData(sampleNoList); + List sampleTestDataList = getTestRecordData(sampleNoList); return sampleTestDataList; } return null; } + //获取样本溶液 - private List getTestRecordSampleSolution( List sampleInfoList){ - List materialIdList= sampleInfoList.stream().map(m -> m.getId()).collect(Collectors.toList()); + private List getTestRecordSampleSolution(List sampleInfoList) { + List materialIdList = sampleInfoList.stream().map(m -> m.getId()).collect(Collectors.toList()); if (CollUtil.isEmpty(materialIdList)) { log.error("检材列表为空！"); return null; @@ -164,27 +178,23 @@ public class IdentifyBookDataServiceImpl implements IdentifyBookDataService { .in(TestRecordSampleSolution::getMaterialId, materialIdList)); return sampleSolutionList; } + //构建TestResult - private List buildTestResult(List testRecordSampleDataList, - List testRecordSampleSolutionList,List sampleInfoList){ + private List buildTestResult(List testRecordSampleDataList, + List sampleInfoList) { //结果：应该是加入实验的检材的结果，目前暂定受理的检材我们按照受理顺序，全部定义为 1号检材，2号检材，3号检材等 //拿出实验数据中的所有实验样本编号，就是数据文件中的sampleId,也是溶液编号中的溶液编号， - List sampleNoList= testRecordSampleDataList.stream().map(s -> s.getSampleNo()).collect(Collectors.toList()); - //取出检材ID - List okTestRecordSampleSolutionIdList=new ArrayList<>(); - testRecordSampleSolutionList.forEach(item->{ - //如果溶液在提供的溶液编号中，则取出来 - if(sampleNoList.contains(item.getSampleNo())){ - okTestRecordSampleSolutionIdList.add(item.getMaterialId()); - } - }); - List retTestResult=new ArrayList<>(); + List sampleNoList = testRecordSampleDataList.stream().map(s -> s.getSampleNo()).collect(Collectors.toList()); + + List retTestResult = new ArrayList<>(); + Map sampleInfoMap = sampleInfoList + .stream() + .collect(Collectors.toMap(SampleInfo::getAcceptNo, Function.identity())); for (TestRecordSampleData testRecordSampleData : testRecordSampleDataList) { - TestResult eg=new TestResult(); - SampleInfo sampleInfo=getSampleInfoBySampleId(testRecordSampleSolutionList, - sampleInfoList,testRecordSampleData.getSampleNo()); + TestResult eg = new TestResult(); + SampleInfo sampleInfo = sampleInfoMap.get(testRecordSampleData.getSampleNo()); eg.setCompoundName(testRecordSampleData.getCompoundName()); - eg.setMaterialNo(sampleInfo.getOrderNo()+"号"); + eg.setMaterialNo(sampleInfo.getOrderNo() + "号"); eg.setOrderNo(sampleInfo.getOrderNo()); eg.setIsFind(testRecordSampleData.getIsDetected()); eg.setTestId(testRecordSampleData.getTestId()); @@ -192,141 +202,147 @@ public class IdentifyBookDataServiceImpl implements IdentifyBookDataService { } return retTestResult; } + //根据sampleID获取对应的检材信息 private SampleInfo getSampleInfoBySampleId(List testRecordSampleSolutionList, - List sampleInfoList,String sampleId){ + List sampleInfoList, String sampleId) { List sampleSolutionList = testRecordSampleSolutionList.stream() .filter(s -> s.getSampleNo().equals(sampleId)).collect(Collectors.toList()); - String materialId=""; - if(sampleSolutionList.size()>0){ - if(sampleSolutionList.size()>1){ - log.info("溶液编号重复 {} ",sampleId); - }else{ - materialId= sampleSolutionList.get(0).getMaterialId(); + String materialId = ""; + if (sampleSolutionList.size() > 0) { + if (sampleSolutionList.size() > 1) { + log.info("溶液编号重复 {} ", sampleId); + } else { + materialId = sampleSolutionList.get(0).getMaterialId(); } } - List retObj=new ArrayList<>(); + List retObj = new ArrayList<>(); for (SampleInfo sampleInfo : sampleInfoList) { - if(sampleInfo.getId().equals(materialId)){ + if (sampleInfo.getId().equals(materialId)) { //找到 retObj.add(sampleInfo); } } - if(retObj.size()!=1){ + if (retObj.size() != 1) { log.info("存在重复的检材"); return null; } - if(retObj.size()==0){ + if (retObj.size() == 0) { log.info("未查询到检材"); return null; - }else { + } else { return retObj.get(0); } } + //构建实验结果 - private List buildTestResultDes(List resultList){ + private List buildTestResultDes(List resultList) { //按照检材编号先分组，这样的话，如果有n个检材，m个化合物，那么就会分成n组,每组中就m条数据 Map> resultMap1 = resultList.stream().collect(Collectors.groupingBy(m -> m.getMaterialNo())); //我们把每组中的List 数据再次分组，分组按检出和未检出分，这样就会得到2个组，一个组是检出的，一个组是未检出的 - Map>> resultMap2=new HashMap<>(); - resultMap1.forEach((k,v)->{ + Map>> resultMap2 = new HashMap<>(); + resultMap1.forEach((k, v) -> { //按检材编号分组，分成检出和未检出2组 - Map> tmp1Map= v.stream().collect(Collectors.groupingBy(m -> m.getIsFind())); - resultMap2.put(k,tmp1Map);//1号 检出 与未检出 + Map> tmp1Map = v.stream().collect(Collectors.groupingBy(m -> m.getIsFind())); + resultMap2.put(k, tmp1Map);//1号 检出 与未检出 }); // 对 resultMap2进行合并，然后再次分组 - List testResultDetailList=new ArrayList<>(); - resultMap2.forEach((k,v)->{ - Map> tmp2Map=v;//这个map中只有2个key，key为0代表未检出的集合，key为1表示检出的集合 - TestResultDetail testResultDetail= buildCompoundList(tmp2Map, k); + List testResultDetailList = new ArrayList<>(); + resultMap2.forEach((k, v) -> { + Map> tmp2Map = v;//这个map中只有2个key，key为0代表未检出的集合，key为1表示检出的集合 + TestResultDetail testResultDetail = buildCompoundList(tmp2Map, k); testResultDetailList.add(testResultDetail); }); // 对 testResultDetailList 进行 分组 //现在对上面的数据进行从新分组，按检出+化合物的形式 Map> temp2 = testResultDetailList.stream().collect( Collectors.groupingBy(m -> m.getFindCompounds() + m.getNoFindCompounds())); - List testResultDes= testResultSorted(temp2); + List testResultDes = testResultSorted(temp2); return testResultDes; } + //对第一个结果进行排序 - private List testResultSorted(Map> tmpMap){ - List>> targetList=new ArrayList>>(tmpMap.entrySet()); + private List testResultSorted(Map> tmpMap) { + List>> targetList = new ArrayList>>(tmpMap.entrySet()); targetList.sort(new Comparator>>() { @Override public int compare(Map.Entry> mp1, Map.Entry> mp2) { int materialNo1 = getMinMaterialNo(mp1.getValue()); int materialNo2 = getMinMaterialNo(mp2.getValue()); - return materialNo1-materialNo2; + return materialNo1 - materialNo2; } }); - List testResultDes=new ArrayList<>(); - targetList.forEach((target)->{ - StringBuffer sbNo=new StringBuffer(); - target.getValue().forEach(item->{ + List testResultDes = new ArrayList<>(); + targetList.forEach((target) -> { + StringBuffer sbNo = new StringBuffer(); + target.getValue().forEach(item -> { sbNo.append(item.getMaterialNo()).append(","); }); - if(sbNo.length()>0){ - sbNo.delete(sbNo.length()-1,sbNo.length());//删除最后一个 , + if (sbNo.length() > 0) { + sbNo.delete(sbNo.length() - 1, sbNo.length());//删除最后一个 , } - testResultDes.add(sbNo.toString()+"检材未检出"+target.getValue().get(0).getNoFindCompounds()+",检出了"+target.getValue().get(0).getFindCompounds()); + testResultDes.add(sbNo.toString() + "检材未检出" + target.getValue().get(0).getNoFindCompounds() + ",检出了" + target.getValue().get(0).getFindCompounds()); }); return testResultDes; } + /** * 构造出一个检材一共检出了多少个化合物和未检出多少化合物 + * * @param mapCompound * @param materialNo * @return */ - private TestResultDetail buildCompoundList(Map> mapCompound,String materialNo){ + private TestResultDetail buildCompoundList(Map> mapCompound, String materialNo) { - StringBuffer findCompounds=new StringBuffer();//检出化合物的集合 - StringBuffer noFindCompounds=new StringBuffer();//未检出化合物的集合 - mapCompound.forEach((k1,v1)->{ - if(k1==0){ + StringBuffer findCompounds = new StringBuffer();//检出化合物的集合 + StringBuffer noFindCompounds = new StringBuffer();//未检出化合物的集合 + mapCompound.forEach((k1, v1) -> { + if (k1 == 0) { //未检出 - v1.forEach(item->{ + v1.forEach(item -> { noFindCompounds.append(item.getCompoundName()).append(","); }); } - if(k1==1){ + if (k1 == 1) { //检出 - v1.forEach(item->{ + v1.forEach(item -> { findCompounds.append(item.getCompoundName()).append(","); }); } }); - if(findCompounds.length()>0){ - findCompounds.delete(findCompounds.length()-1,findCompounds.length());//删除最后一个 , + if (findCompounds.length() > 0) { + findCompounds.delete(findCompounds.length() - 1, findCompounds.length());//删除最后一个 , } - if(noFindCompounds.length()>0){ - noFindCompounds.delete(noFindCompounds.length()-1,noFindCompounds.length());//删除最后一个 , + if (noFindCompounds.length() > 0) { + noFindCompounds.delete(noFindCompounds.length() - 1, noFindCompounds.length());//删除最后一个 , } - TestResultDetail eg=new TestResultDetail(); + TestResultDetail eg = new TestResultDetail(); eg.setMaterialNo(materialNo); eg.setFindCompounds(findCompounds.toString()); eg.setNoFindCompounds(noFindCompounds.toString()); return eg; } - private int getMinMaterialNo(List materialList){ + private int getMinMaterialNo(List materialList) { materialList.sort(new Comparator() { @Override public int compare(TestResultDetail t1, TestResultDetail t2) { - int mNo1= Integer.parseInt(getNumberByMaterialNo(t1.getMaterialNo())); - int mNo2= Integer.parseInt(getNumberByMaterialNo(t2.getMaterialNo())); - return mNo1-mNo2; + int mNo1 = Integer.parseInt(getNumberByMaterialNo(t1.getMaterialNo())); + int mNo2 = Integer.parseInt(getNumberByMaterialNo(t2.getMaterialNo())); + return mNo1 - mNo2; } }); - return Integer.parseInt(getNumberByMaterialNo(materialList.get(0).getMaterialNo())); + return Integer.parseInt(getNumberByMaterialNo(materialList.get(0).getMaterialNo())); } /** * 根据编号获取排序值 + * * @param materialNo * @return */ - private String getNumberByMaterialNo(String materialNo){ + private String getNumberByMaterialNo(String materialNo) { Pattern pattern = Pattern.compile("\\d+"); Matcher matcher = pattern.matcher(materialNo); while (matcher.find()) { @@ -334,12 +350,14 @@ public class IdentifyBookDataServiceImpl implements IdentifyBookDataService { } return ""; } + /** * 根据溶液编号(sampleNo)获取仪器检测数据 + * * @param sampleNoList * @return */ - private List getTestRecordData(List sampleNoList){ + private List getTestRecordData(List sampleNoList) { return testRecordSampleDataService.list(Wrappers.lambdaQuery() .in(TestRecordSampleData::getSampleNo, sampleNoList)); }