Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -128,6 +128,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/sys/planDetail/revStopPlanDetails").permitAll()
                 .antMatchers("/sys/plan/getDefaultPlans").permitAll()
                 .antMatchers("/sys/dictionaryInfo/getList").permitAll()
+                .antMatchers("/sys/dictionaryInfo/getListBack").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -170,6 +170,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/sys/planDetail/revStopPlanDetails", request)
                 || matchers("/sys/plan/getDefaultPlans", request)
                 || matchers("/sys/dictionaryInfo/getList", request)
+                || matchers("/sys/dictionaryInfo/getListBack", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -35,6 +35,21 @@ public class DictionaryFacade extends DictionaryInfoServiceImpl {
         return EntityUtil.makeEntityListMap(listRes, "groupType");
     }
 
+    /**
+     * 返回字典信息
+     *
+     * @return
+     */
+    public Map<Long, List<DictionaryInfoDTO>> getListBack() {
+        List<DictionaryInfo> list = this.list(new QueryWrapper<DictionaryInfo>()
+                .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 1L }))
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByAsc("group_type", "order_no"));
+        List<DictionaryInfoDTO> listRes = BeanUtil.listCopyTo(list, DictionaryInfoDTO.class);
+        return EntityUtil.makeEntityListMap(listRes, "groupType");
+    }
+
+
     /**
      * 返回指定字典信息
      *

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

@@ -148,9 +148,30 @@ public class PlanFacade extends PlanServiceImpl {
             }
             // 获取明细信息
             List<PlanDetailDTO> PlanDetailDatas = sysSetFacade.getByPlanIds(ids);
+            List<PlanDetailDTO> sysSetInfoData = BeanUtil.listCopyTo(PlanDetailDatas, PlanDetailDTO.class);
+            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));
+                    }
+                }
+            }
+
             Map<Long, List<PlanDetailDTO>> map = new HashMap<>();
             // 获取所有用户开通的产品信息
-            map = EntityUtil.makeEntityListMap(PlanDetailDatas, "planId");
+            map = EntityUtil.makeEntityListMap(planDetailParent, "planId");
             if (map.size() > 0) {
                 for (PlanInfoPageDTO planInfo : planInfos) {
                     List<PlanDetailDTO> planDetails = map.get(planInfo.getId());

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/conceptDetail")
 @Api(value = "静态知识内容相关API", tags = { "静态知识内容相关API" })
+@SuppressWarnings("unchecked")
 public class ConceptDetailController {
 
 }

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

@@ -34,6 +34,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/graph/conceptInfo")
 @Api(value = "静态知识标准术语相关API", tags = { "静态知识标准术语相关API" })
+@SuppressWarnings("unchecked")
 public class ConceptInfoController {
 
     @Autowired

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

@@ -34,6 +34,7 @@ import javax.validation.Valid;
 @RestController
 @RequestMapping("/tran/deptConfig")
 @Api(value = "科室公表映射API", tags = { "科室公表映射API" })
+@SuppressWarnings("unchecked")
 public class DeptConfigController {
     @Autowired
     private DeptConfigFacade deptConfigFacade;

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

@@ -29,7 +29,7 @@ public class DictionaryInfoController {
     @Autowired
     DictionaryFacade dictionaryFacade;
 
-    @ApiOperation(value = "返回字典信息[by:gaodm]",
+    @ApiOperation(value = "返回字典信息(界面返回)[by:gaodm]",
             notes = "")
     @PostMapping("/getList")
     @SysLogger("getList")
@@ -37,4 +37,13 @@ public class DictionaryInfoController {
         Map<Long, List<DictionaryInfoDTO>> data = dictionaryFacade.getList();
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "返回字典信息(后台维护返回)[by:gaodm]",
+            notes = "")
+    @PostMapping("/getListBack")
+    @SysLogger("getListBack")
+    public RespDTO<Map<Long, List<DictionaryInfoDTO>>> getListBack() {
+        Map<Long, List<DictionaryInfoDTO>> data = dictionaryFacade.getListBack();
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -1,13 +1,16 @@
 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;
@@ -58,14 +61,15 @@ public class PlanController {
         return RespDTO.onSuc(res);
     }
 
-    /*@ApiOperation(value = "分页获取方案配置信息[by:wangfeng]", notes = "分页获取方案配置信息")
+    @ApiOperation(value = "分页获取方案配置信息[by:wangfeng]", notes = "分页获取方案配置信息")
     @PostMapping("/getPlanInfoPages")
     @SysLogger("getPlanInfoPages")
     @Transactional
     public RespDTO<IPage<PlanInfoPageDTO>> getPlanInfoPages(@RequestBody HospitalPlanPageVO hospitalPlanPageVO) {
         IPage<PlanInfoPageDTO> data = planFacade.getPlanInfoPage(hospitalPlanPageVO);
         return RespDTO.onSuc(data);
-    }*/
+    }
+
 
     @ApiOperation(value = "删除方案配置信息[by:wangfeng]", notes = "planId：方案id 必传")
     @PostMapping("/cancelPlanDatas")