方案配置修改

cdssman-service/src/main/java/com/diagbot/dto/PlanInfoDefaultDTO.java

@@ -0,0 +1,35 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-14 14:29
+ */
+@Setter
+@Getter
+public class PlanInfoDefaultDTO {
+
+    private Long id;
+    /**
+     * 医院编码
+     */
+    private Long hospitalId;
+    /**
+     * 方案编号
+     */
+    private String planName;
+
+    private String planCode;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private List<PlanDetailDTO> planDetailDefault;
+}
+

cdssman-service/src/main/java/com/diagbot/facade/PlanFacade.java

@@ -4,6 +4,7 @@ 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.PlanInfoDefaultDTO;
 import com.diagbot.dto.PlanInfoPagesDTO;
 import com.diagbot.entity.Plan;
 import com.diagbot.enums.IsDeleteEnum;
@@ -66,10 +67,10 @@ public class PlanFacade extends PlanServiceImpl {
             UpdateWrapper<Plan> planQuery = new UpdateWrapper<>();
             planQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("id", hospitalPlanSaveVO.getId())
-                    .set("gmt_modified",now)
+                    .set("gmt_modified", now)
                     .set("gmt_create", now)
-                    .set("creator",UserUtils.getCurrentPrincipleID())
-                    .set("modifier",UserUtils.getCurrentPrincipleID())
+                    .set("creator", UserUtils.getCurrentPrincipleID())
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
                     .set("hospital_id", hospitalPlanSaveVO.getHospitalId())
                     .set("plan_name", hospitalPlanSaveVO.getPlanName())
                     .set("plan_code", hospitalPlanSaveVO.getPlanCode())
@@ -180,12 +181,21 @@ public class PlanFacade extends PlanServiceImpl {
     }
 
 
-    public List<PlanInfoPagesDTO> getPlansDefaults() {
-        List<Plan> list = this.list(new QueryWrapper<Plan>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", 0
-                ));
-        List<PlanInfoPagesDTO> data = BeanUtil.listCopyTo(list,PlanInfoPagesDTO.class);
+    public PlanInfoDefaultDTO getPlansDefaults() {
+        PlanInfoDefaultDTO data = new PlanInfoDefaultDTO();
+        QueryWrapper<Plan> planFand = new QueryWrapper<>();
+        planFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("plan_code", "plan_default")
+                .eq("hospital_id", 0L);
+        Plan plan = getOne(planFand, false);
+        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 = planDetailFacade.getSysSetInfoData(hospitalSetVO);
+        data.setPlanDetailDefault(sysSetInfoData);
         return data;
     }
 

cdssman-service/src/main/java/com/diagbot/web/PlanController.java

@@ -3,6 +3,7 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.PlanInfoDefaultDTO;
 import com.diagbot.dto.PlanInfoPagesDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PlanFacade;
@@ -18,8 +19,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -27,7 +26,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wangfeng
@@ -89,8 +88,8 @@ public class PlanController {
     @PostMapping("/getPlansDefault")
     @SysLogger("getPlansDefault")
     @Transactional
-    public RespDTO<List<PlanInfoPagesDTO>> getPlansDefault() {
-        List<PlanInfoPagesDTO> data = planFacade.getPlansDefaults();
+    public RespDTO<PlanInfoDefaultDTO> getPlansDefault() {
+        PlanInfoDefaultDTO data = planFacade.getPlansDefaults();
         return RespDTO.onSuc(data);
     }
 }