获取默认方案2

src/main/java/com/diagbot/dto/PlanDetailDefaultDTO.java

@@ -1,53 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description:
- * @date 2020-08-14 14:03
- */
-@Setter
-@Getter
-public class PlanDetailDefaultDTO {
-    private Long id;
-    private Long hospitalId;
-
-    /**
-     * 方案编号
-     */
-    private Long planId;
-    private Long parentId;
-    /**
-     * 配置名称
-     */
-    private String name;
-
-
-
-    private String value;
-
-    /**
-     * 是否显示（1是，0否）
-     */
-    private Integer status;
-
-    /**
-     * 显示个数
-     */
-    private Integer number;
-
-    /**
-     * 显示顺序
-     */
-    private Integer orderNo;
-    /**
-     * 配置编码
-     */
-    private String code;
-    /**
-     * 备注
-     */
-    private String remark;
-}

src/main/java/com/diagbot/dto/PlanInfoDefaultDTO.java

@@ -30,5 +30,5 @@ public class PlanInfoDefaultDTO {
      */
     private String remark;
 
-    private List<PlanDetailDefaultDTO> planDetailDefault;
+    private List<PlanDetailDTO> planDetailDefault;
 }

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

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.PlanDetailDTO;
-import com.diagbot.dto.PlanDetailDefaultDTO;
 import com.diagbot.dto.PlanInfoDefaultDTO;
 import com.diagbot.dto.PlanInfoPageDTO;
 import com.diagbot.dto.SysPlanInfoDTO;
 import com.diagbot.entity.Plan;
-import com.diagbot.entity.PlanDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -235,14 +233,14 @@ public class PlanFacade extends PlanServiceImpl {
                 .eq("plan_code", "plan_default")
                 .eq("hospital_id", 0L);
         Plan plan = getOne(planFand, false);
-        BeanUtil.copyProperties(plan, data);
-        QueryWrapper<PlanDetail> planDetailFand = new QueryWrapper<>();
-        planDetailFand.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("plan_id", plan.getId())
-                .eq("hospital_id", 0);
-        List<PlanDetail> list = sysSetFacade.list(planDetailFand);
-        List<PlanDetailDefaultDTO> listDefault = BeanUtil.listCopyTo(list, PlanDetailDefaultDTO.class);
-        data.setPlanDetailDefault(listDefault);
+        BeanUtil.copyProperties(plan,data);
+        List<Long> planId = new ArrayList<>();
+        planId.add(plan.getId());
+        HospitalSetVO hospitalSetVO = new HospitalSetVO();
+        hospitalSetVO.setHospitalId(0L);
+        hospitalSetVO.setPlanId(planId);
+        List<PlanDetailDTO> sysSetInfoData = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+        data.setPlanDetailDefault(sysSetInfoData);
         return data;
     }
 }

src/main/java/com/diagbot/web/PlanController.java

@@ -1,16 +1,13 @@
 package com.diagbot.web;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.annotation.TokenAuth;
 import com.diagbot.dto.PlanInfoDefaultDTO;
-import com.diagbot.dto.PlanInfoPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysPlanInfoDTO;
 import com.diagbot.facade.PlanFacade;
 import com.diagbot.vo.HospitalPlanCancelVO;
-import com.diagbot.vo.HospitalPlanPageVO;
 import com.diagbot.vo.HospitalPlanSaveVO;
 import com.diagbot.vo.HospitalPlanVO;
 import com.diagbot.vo.PlanRevStopVO;