liding
2025-04-08 09ddece4effc738f2611c053d8f0f1fb22102597
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -296,7 +296,7 @@
        // 对检测对象先按照实验室在按照检查对象类别分类
        List<BasicTreeDto> testProjectBasicTreeList = structureTestObjectList.stream().map(structureTestObject -> {
            BasicTreeDto basicTreeDto = new BasicTreeDto();
            basicTreeDto.setValue(structureTestObject.getSpecimenName() + "(" + structureTestObject.getObjectType() + ")");
            basicTreeDto.setValue(structureTestObject.getSpecimenName());
            basicTreeDto.setLabel(structureTestObject.getSpecimenName() + "(" + structureTestObject.getObjectType() + ")");
            basicTreeDto.setLevel(BasicTreeEnums.STRUCTURE_TEST_OBJECT_TYPE.getCode());
            List<BasicTreeDto> children = new ArrayList<>();
@@ -600,15 +600,19 @@
        List<StructureTestObject> testObjects = new ArrayList<>();
        for (FactoryDto factoryDto : list) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                List<SampleTypeDto> children = laboratoryDto.getChildren();
                int sort = 0;
                // 循环第三层
                for (SampleTypeDto child : children) {
                    StructureTestObject structureTestObject = new StructureTestObject();
                    structureTestObject.setSort(sort);
                    structureTestObject.setId(child.getSampleTypeId());
                    testObjects.add(structureTestObject);
                    sort++;
                for (ObjectTypeDto objectTypeDto : laboratoryDto.getChildren()) {
                    for (WorkShopNameDto workShopNameDto:objectTypeDto.getChildren()) {
                        List<SampleTypeDto> children =  workShopNameDto.getChildren();
                        int sort = 0;
                        for (SampleTypeDto child : children) {
                            StructureTestObject structureTestObject = new StructureTestObject();
                            structureTestObject.setSort(sort);
                            structureTestObject.setId(child.getSampleTypeId());
                            testObjects.add(structureTestObject);
                            sort++;
                        }
                    }
                }
            }
        }