优化默认方案2

src/main/java/com/diagbot/facade/PlanDetailFacade.java

@@ -51,8 +51,6 @@ public class PlanDetailFacade extends PlanDetailServiceImpl {
                 .in("plan_id", hospitalSetVO.getPlanId())
                 .orderByAsc("plan_id", "order_no");
         List<PlanDetail> sysSetData = list(sysSetInfo);
-        //List<PlanDetailDTO> data = BeanUtil.listCopyTo(sysSetData, PlanDetailDTO.class);
-        //return data;
         List<PlanDetailDTO> sysSetInfoData = BeanUtil.listCopyTo(sysSetData, PlanDetailDTO.class);
         List<PlanDetailDTO> planDetailParent = new ArrayList<>();//父级数据
         List<PlanDetailDTO> planDetailSub = new ArrayList<>();//子级数据

src/main/java/com/diagbot/facade/PlanFacade.java

@@ -82,26 +82,7 @@ public class PlanFacade extends PlanServiceImpl {
         hospitalSetVO.setHospitalId(hospitalId);
         hospitalSetVO.setPlanId(planId);
         List<PlanDetailDTO> sysSetInfoData = sysSetFacade.getSysSetInfoData(hospitalSetVO);
-       /* List<PlanDetailDTO> planDetailParent = new ArrayList<>();//父级数据
-        List<PlanDetailDTO> planDetailSub = new ArrayList<>();//子级数据
-        //分离数据，-1分父级菜单
-        for (PlanDetailDTO dataDeta : sysSetInfoData) {
-            if (dataDeta.getParentId() == (-1)) {
-                planDetailParent.add(dataDeta);
-            } else {
-                planDetailSub.add(dataDeta);
-            }
-        }
-        //把子级数据，放在父级下
-        Map<Long, List<PlanDetailDTO>> mapParentId = planDetailSub.stream().collect(Collectors.groupingBy(PlanDetailDTO::getParentId));
-        for (Long key : mapParentId.keySet()) {
-            for (PlanDetailDTO sysPlanInfos : planDetailParent) {
-                if (sysPlanInfos.getId().equals(key)) {
-                    sysPlanInfos.setPlanDetails(mapParentId.get(key));
-                }
-            }
-        }*/
-        //把父级数据放在方案下
+        //把父级和子级数据sysSetInfoData放在方案下
         Map<Long, List<PlanDetailDTO>> dataMap = sysSetInfoData.stream().collect(Collectors.groupingBy(PlanDetailDTO::getPlanId));
         for (Long key : dataMap.keySet()) {
             for (SysPlanInfoDTO sysPlanInfos : sysPlanInfoDTO) {
@@ -233,7 +214,7 @@ public class PlanFacade extends PlanServiceImpl {
                 .eq("plan_code", "plan_default")
                 .eq("hospital_id", 0L);
         Plan plan = getOne(planFand, false);
-        BeanUtil.copyProperties(plan,data);
+        BeanUtil.copyProperties(plan, data);
         List<Long> planId = new ArrayList<>();
         planId.add(plan.getId());
         HospitalSetVO hospitalSetVO = new HospitalSetVO();