Merge remote-tracking branch 'origin/dev/ez-security210625' into dev/ez-security210625

common/src/main/java/com/lantone/common/dto/DeptListDTO.java

@@ -0,0 +1,27 @@
+package com.lantone.common.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 科室表 实体类
+ * </p>
+ */
+@Data
+public class DeptListDTO implements Serializable {
+
+
+
+    /**
+     * 主键
+     */
+
+    private Long id;
+
+    /**
+     * 科室名称
+     */
+    @TableField("name")
+    private String name;
+}

common/src/main/java/com/lantone/common/vo/CheckSolveRegionVO.java

@@ -21,7 +21,7 @@ public class CheckSolveRegionVO {
     @NotNull(message ="病区id不能为空" )
     private Integer id;
 
-    @ApiModelProperty(value = "0-禁用校验标识 1-禁用此病区")
+    @ApiModelProperty(value = "0-禁用校验标识 1-禁用此病区 2-启用此病区")
     @NotNull(message ="操作标识不能为空" )
     private Integer mark = 0;
 }

common/src/main/java/com/lantone/common/vo/GetDeptListVO.java

@@ -3,8 +3,6 @@ package com.lantone.common.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import javax.validation.constraints.NotNull;
-
 
 /**
  * @Description:
@@ -19,8 +17,4 @@ public class GetDeptListVO {
 
     @ApiModelProperty(value = "科室名称")
     private String deptName;
-
-    @ApiModelProperty(value = "标记（0-返回科室列表 1-返回互斥科室列表）")
-    @NotNull(message ="标记不能为空" )
-    private Integer mark = 0;
 }

common/src/main/java/com/lantone/common/vo/GetDictionaryVO.java

@@ -13,7 +13,7 @@ public class GetDictionaryVO implements Serializable {
     @ApiModelProperty(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "分组（值自定义）")
+    @ApiModelProperty(value = "代码类别")
     private Long groupType;
 
     @ApiModelProperty(value = "代码名称")

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DictionaryInfo.java

@@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -50,48 +49,62 @@ public class DictionaryInfo implements Serializable {
      * 是否启用(0-否 1-是)
      */
     @TableField("status")
+    @JsonIgnore
     private Long status;
 
+    /**
+     * 是否启用(启用 禁用)
+     */
+    @TableField(exist = false)
+    private String statusStr;
+
     /**
      * 返回类型（0: 都返回，1：后台维护返回 2：界面返回）
      */
     @TableField("return_type")
+    @JsonIgnore
     private Integer returnType;
 
     /**
      * 排序号
      */
     @TableField("order_no")
+    @JsonIgnore
     private Integer orderNo;
 
     /**
      * 是否删除,N:未删除，Y:删除
      */
     @TableField("is_deleted")
+    @JsonIgnore
     private String isDeleted;
 
     /**
      * 记录创建时间
      */
     @TableField("gmt_create")
+    @JsonIgnore
     private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
     @TableField("gmt_modified")
+    @JsonIgnore
     private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
      */
     @TableField("creator")
+    @JsonIgnore
     private String creator;
 
     /**
      * 修改人,如果为0则表示纪录未修改
      */
     @TableField("modifier")
+    @JsonIgnore
     private String modifier;
 
     /**

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalSet.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -60,30 +61,35 @@ public class HospitalSet implements Serializable {
      * 是否删除,N:未删除，Y:删除
      */
     @TableField("is_deleted")
+    @JsonIgnore
     private String isDeleted;
 
     /**
      * 记录创建时间
      */
     @TableField("gmt_create")
+    @JsonIgnore
     private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
     @TableField("gmt_modified")
+    @JsonIgnore
     private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
      */
     @TableField("creator")
+    @JsonIgnore
     private String creator;
 
     /**
      * 修改人,如果为0则表示纪录未修改
      */
     @TableField("modifier")
+    @JsonIgnore
     private String modifier;
 
     /**

dblayer-mbg/src/main/resources/mapper/RegionMapper.xml

@@ -24,6 +24,7 @@
         and t1.id = t2.region_id
         where
         t1.is_deleted = 'N'
+        order by t1.order_no,t1.gmt_create desc;
         <if test='hospitalId != null and hospitalId != ""'>
             AND t1.hospital_id = #{hospitalId}
         </if>

security-center/src/main/java/com/lantone/security/facade/DictionaryManagementFacade.java

@@ -3,6 +3,7 @@ package com.lantone.security.facade;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.exception.ApiException;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.vo.SaveDictionaryVO;
@@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -57,25 +60,36 @@ public class DictionaryManagementFacade {
     public IPage<DictionaryInfo> getDictionary(GetDictionaryVO getDictionaryVO) {
         IPage<DictionaryInfo> pageInfo = new Page();
         LambdaQueryChainWrapper<DictionaryInfo> dictionaryInfoLambdaQuery = dictionaryInfoFacade.lambdaQuery();
+        dictionaryInfoLambdaQuery.eq(DictionaryInfo::getIsDeleted, IsDeleteEnum.N.getKey());
         if (StringUtil.isNotEmpty(getDictionaryVO.getName())) {
             dictionaryInfoLambdaQuery.like(DictionaryInfo::getName, getDictionaryVO.getName());
         }
         if (null != getDictionaryVO.getGroupType()) {
             dictionaryInfoLambdaQuery.like(DictionaryInfo::getGroupType, getDictionaryVO.getGroupType());
         }
+        dictionaryInfoLambdaQuery.orderByDesc(DictionaryInfo::getGmtCreate);
         IPage<DictionaryInfo> page = dictionaryInfoLambdaQuery.page(pageInfo);
+        page.getRecords().forEach(obj->{
+            if(null != obj.getStatus() && 1 == obj.getStatus()){
+                obj.setStatusStr("启用");
+            }
+            if(null != obj.getStatus() && 0 == obj.getStatus()){
+                obj.setStatusStr("禁用");
+            }
+        });
+        page.setRecords(page.getRecords());
         return page;
     }
 
     /**
-     * @Description: 删除字典管理
+     * @Description: 删除字典管理--逻辑删除
      * @Param: [id]
      * @return: java.lang.Boolean
      * @Author: cy
      * @Date: 2021/7/30
      */
     public Boolean deleteDictionary(Integer id) {
-        return dictionaryInfoFacade.lambdaUpdate().eq(DictionaryInfo::getId,id).remove();
+        return dictionaryInfoFacade.lambdaUpdate().eq(DictionaryInfo::getId,id).set(DictionaryInfo::getIsDeleted, IsDeleteEnum.Y.getKey()).update();
     }
 
 
@@ -89,6 +103,7 @@ public class DictionaryManagementFacade {
     public void checkDictionary(SaveDictionaryVO saveDictionaryVO) {
         if (null == saveDictionaryVO.getId()) {
             Integer count = dictionaryInfoFacade.lambdaQuery()
+                    .eq(DictionaryInfo::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(DictionaryInfo::getName, saveDictionaryVO.getName())
                     .eq(DictionaryInfo::getVal, saveDictionaryVO.getVal())
                     .count();
@@ -122,5 +137,24 @@ public class DictionaryManagementFacade {
         dictionaryInfo.setModifier("程瑶改");
         return dictionaryInfoFacade.updateById(dictionaryInfo);
     }
+
+
+    /**
+     * @Description: 查看字典管理代码类别
+     * @Param: [groupType]
+     * @return: java.util.List<java.lang.String>
+     * @Author: cy
+     * @Date: 2021/8/9
+     */
+    public List<String> getCodeCategory(String groupType) {
+        LambdaQueryChainWrapper<DictionaryInfo> dictionaryInfoLambdaQuery = dictionaryInfoFacade.lambdaQuery();
+        dictionaryInfoLambdaQuery.eq(DictionaryInfo::getIsDeleted, IsDeleteEnum.N.getKey());
+        if(StringUtil.isNotBlank(groupType)){
+            dictionaryInfoLambdaQuery.like(DictionaryInfo::getGroupType, groupType);
+        }
+        return dictionaryInfoLambdaQuery.groupBy(DictionaryInfo::getGroupType).list()
+                .stream().filter(obj->null != obj.getGroupType())
+                .map(obj -> obj.getGroupType().toString()).sorted().collect(Collectors.toList());
+    }
 }
 

security-center/src/main/java/com/lantone/security/facade/HospitalSetManagementFacade.java

@@ -2,6 +2,7 @@ package com.lantone.security.facade;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.exception.ApiException;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.vo.GetHospitalSetVO;
@@ -12,6 +13,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -54,31 +57,31 @@ public class HospitalSetManagementFacade {
     public IPage<HospitalSet> getHospitalSet(GetHospitalSetVO getHospitalSetVO) {
         IPage<HospitalSet> pageInfo = new Page();
         LambdaQueryChainWrapper<HospitalSet> hospitalSetLambdaQuery = hospitalSetFacade.lambdaQuery();
-      //  if (StringUtil.isNotEmpty(getHospitalSetVO.getHospitalName())) {
-            /**
-             * 数据库加入医院名称字段，此处代码修改
-             */
-         //   hospitalSetLambdaQuery.like(HospitalSet::getHospitalId, getHospitalSetVO.getHospitalId());
-       // }
+        hospitalSetLambdaQuery.eq(HospitalSet::getIsDeleted, IsDeleteEnum.N.getKey());
+        if (StringUtil.isNotEmpty(getHospitalSetVO.getHospitalName())) {
+            hospitalSetLambdaQuery.like(HospitalSet::getHospitalName, getHospitalSetVO.getHospitalName());
+        }
         if (StringUtil.isNotEmpty(getHospitalSetVO.getName())) {
             hospitalSetLambdaQuery.like(HospitalSet::getName, getHospitalSetVO.getName());
         }
         if (null != getHospitalSetVO.getCode()) {
             hospitalSetLambdaQuery.like(HospitalSet::getCode, getHospitalSetVO.getCode());
         }
+        hospitalSetLambdaQuery.orderByDesc(HospitalSet::getGmtCreate);
         IPage<HospitalSet> page = hospitalSetLambdaQuery.page(pageInfo);
         return page;
     }
 
     /**
-     * @Description: 删除参数管理
+     * @Description: 删除参数管理-逻辑删除
      * @Param: [id]
      * @return: java.lang.Boolean
      * @Author: cy
      * @Date: 2021/7/30
      */
-    public Boolean deleteDictionary(Integer id) {
-        return hospitalSetFacade.lambdaUpdate().eq(HospitalSet::getId,id).remove();
+    public Boolean deleteHospitalSet(Integer id) {
+        return hospitalSetFacade.lambdaUpdate().eq(HospitalSet::getId,id)
+                .set(HospitalSet::getIsDeleted, IsDeleteEnum.Y.getKey()).update();
     }
 
 
@@ -94,7 +97,9 @@ public class HospitalSetManagementFacade {
     public void checkHospitalSet(SaveHospitalSetVO saveHospitalSetVO) {
         if (null == saveHospitalSetVO.getId()) {
             Integer count = hospitalSetFacade.lambdaQuery()
+                    .eq(HospitalSet::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(HospitalSet::getName, saveHospitalSetVO.getName())
+                    .eq(HospitalSet::getHospitalId, saveHospitalSetVO.getHospitalId())
                     .eq(HospitalSet::getVal, saveHospitalSetVO.getVal())
                     .count();
             if (count > 0) {
@@ -128,4 +133,21 @@ public class HospitalSetManagementFacade {
         hospitalSet.setModifier("程瑶改");
         return hospitalSetFacade.updateById(hospitalSet);
     }
+
+    /**
+     * @Description:  查看参数管理所属组织
+     * @Param: [hospitalName]
+     * @return: java.util.List<java.lang.String>
+     * @Author: cy
+     * @Date: 2021/8/9
+     */
+    public List<String> getHospitalNames(String hospitalName) {
+        LambdaQueryChainWrapper<HospitalSet> hospitalSetLambdaQuery = hospitalSetFacade.lambdaQuery();
+        if(StringUtil.isNotBlank(hospitalName)){
+            hospitalSetLambdaQuery.like(HospitalSet::getHospitalName,hospitalName);
+        }
+        hospitalSetLambdaQuery.eq(HospitalSet::getIsDeleted, IsDeleteEnum.N.getKey());
+        hospitalSetLambdaQuery.groupBy(HospitalSet::getHospitalName);
+        return  hospitalSetLambdaQuery.list().stream().filter(obj -> StringUtil.isNotBlank(obj.getHospitalName())).map(obj -> obj.getHospitalName()).sorted().collect(Collectors.toList());
+    }
 }

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -3,6 +3,8 @@ package com.lantone.security.facade;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
+import com.lantone.common.dto.DeptListDTO;
 import com.lantone.common.dto.ViewRegionDTO;
 import com.lantone.common.exception.ApiException;
 import com.lantone.common.util.ListUtil;
@@ -116,18 +118,13 @@ public class RegionManagementFacade {
      */
     public void getRegion(SaveRegionVO saveRegionVo) {
         if (null == saveRegionVo.getId()) {
-            List<Long> collects = regionFacade.lambdaQuery()
+            Region region = regionFacade.lambdaQuery()
+                    .eq(Region::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(Region::getName, saveRegionVo.getName())
                     .eq(Region::getHospitalId, saveRegionVo.getHospitalId())
-                    .list().stream().map(obj -> obj.getId()).collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(collects) && ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
-                Integer count = regionDeptService.lambdaQuery()
-                        .eq(RegionDept::getHospitalId, saveRegionVo.getHospitalId())
-                        .in(RegionDept::getRegionId, collects)
-                        .in(RegionDept::getDeptId, saveRegionVo.getDeptIds()).count();
-                if (count > 0) {
-                    throw new ApiException("当前病区关联科室重复");
-                }
+                    .one();
+            if(null != region && null != region.getId()){
+                throw new ApiException("当前组织和病区已重复");
             }
         }
     }
@@ -170,9 +167,12 @@ public class RegionManagementFacade {
         sysRegion.setModifier("程瑶改");
         regionFacade.updateById(sysRegion);
         if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
-            List<Region> list = regionFacade.lambdaQuery().eq(Region::getId, saveRegionVo.getId()).list();
+            Region region = regionFacade.lambdaQuery()
+                    .eq(Region::getId, saveRegionVo.getId())
+                    .eq(Region::getIsDeleted, IsDeleteEnum.N.getKey()).one();
             regionDeptService.lambdaUpdate()
                     .eq(RegionDept::getHospitalId, saveRegionVo.getHospitalId())
+                    .eq(RegionDept::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(RegionDept::getRegionId, saveRegionVo.getId()).remove();
             saveRegionVo.getDeptIds().forEach(obj -> {
                 RegionDept sysRegionDeptEntry = new RegionDept();
@@ -180,9 +180,9 @@ public class RegionManagementFacade {
                 sysRegionDeptEntry.setId(null);
                 sysRegionDeptEntry.setDeptId(obj);
                 sysRegionDeptEntry.setRegionId(saveRegionVo.getId());
-                if (ListUtil.isNotEmpty(list)) {
-                    sysRegionDeptEntry.setGmtCreate(list.get(0).getGmtCreate());
-                    sysRegionDeptEntry.setCreator(list.get(0).getCreator());
+                if (null != region) {
+                    sysRegionDeptEntry.setGmtCreate(region.getGmtCreate());
+                    sysRegionDeptEntry.setCreator(region.getCreator());
                 }
                 sysRegionDeptEntry.setGmtModified(new Date());
                 sysRegionDeptEntry.setModifier("后期修改");
@@ -194,7 +194,7 @@ public class RegionManagementFacade {
     }
 
     /**
-     * @Description: 校验/禁用病区管理
+     * @Description: 校验/禁用-启用病区管理
      * @Param: [checkSolveRegionVO]
      * @return: java.lang.Object
      * @Author: cy
@@ -204,6 +204,7 @@ public class RegionManagementFacade {
         //禁用校验
         if (null != checkSolveRegionVO.getId() && 0 == checkSolveRegionVO.getMark()) {
             List<Long> collectList = regionDeptService.lambdaQuery()
+                    .eq(RegionDept::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(RegionDept::getRegionId,checkSolveRegionVO.getId())
                     .eq(RegionDept::getHospitalId,checkSolveRegionVO.getHospitalId())
                     .list().stream().map(obj -> obj.getDeptId()).collect(Collectors.toList());
@@ -214,12 +215,18 @@ public class RegionManagementFacade {
             return 0;
         }
 
-        //禁用病区处理
-        if (null != checkSolveRegionVO.getId() && 1 == checkSolveRegionVO.getMark()) {
-            regionFacade.lambdaUpdate()
-                    .eq(Region::getId,checkSolveRegionVO.getId())
-                    .eq(Region::getHospitalId,checkSolveRegionVO.getHospitalId())
-                    .set(Region::getStatus,0).update();
+        //禁用-启用病区处理
+        if (null != checkSolveRegionVO.getId() && (1 == checkSolveRegionVO.getMark() || 2 == checkSolveRegionVO.getMark())) {
+            LambdaUpdateChainWrapper<Region> regionLambdaUpdate= regionFacade.lambdaUpdate();
+            regionLambdaUpdate.eq(Region::getIsDeleted, IsDeleteEnum.N.getKey());
+            regionLambdaUpdate.eq(Region::getId,checkSolveRegionVO.getId());
+            regionLambdaUpdate.eq(Region::getHospitalId,checkSolveRegionVO.getHospitalId());
+            if(1 == checkSolveRegionVO.getMark()){
+                regionLambdaUpdate.set(Region::getStatus,0).update();
+            }
+            if(2 == checkSolveRegionVO.getMark()){
+                regionLambdaUpdate.set(Region::getStatus,1).update();
+            }
         }
         return true;
     }
@@ -231,45 +238,21 @@ public class RegionManagementFacade {
      * @Author: cy
      * @Date: 2021/8/2
      */
-    public  List<Dept> getDept(GetDeptListVO getDeptListVO){
-        List<Dept> list = new ArrayList<>();
-        if(0 == getDeptListVO.getMark()){
-            list = queryMethod(getDeptListVO,null);
-        }
-
-        //互斥
-        if(1 == getDeptListVO.getMark()) {
-            //关联或被禁止的科室id
-            List<Long> regionDeptIds = regionDeptService.lambdaQuery()
-                    .eq(RegionDept::getHospitalId,getDeptListVO.getHospitalId())
-                    .eq(RegionDept::getIsDeleted,IsDeleteEnum.N.getKey())
-                    .list().stream().map(obj -> obj.getDeptId()).collect(Collectors.toList());
-
-            if(ListUtil.isNotEmpty(regionDeptIds)){
-                list = queryMethod(getDeptListVO,regionDeptIds);
-            }
-        }
-
-        return list;
-    }
-
-    /**
-     * @Description: 科室lambdaQueryChainWrapper
-     * @Param: [getDeptListVO, regionDeptIds]
-     * @return: java.util.List<com.lantone.dblayermbg.entity.Dept>
-     * @Author: cy
-     * @Date: 2021/8/2
-     */
-    public List<Dept> queryMethod(GetDeptListVO getDeptListVO, List<Long> regionDeptIds){
+    public  List<DeptListDTO> getDept(GetDeptListVO getDeptListVO){
+        List<DeptListDTO> deptListDTOS = new ArrayList<>();
         LambdaQueryChainWrapper<Dept> lambdaQueryChainWrapper = deptFacade.lambdaQuery();
         lambdaQueryChainWrapper.eq(Dept::getHospitalId,getDeptListVO.getHospitalId());
         lambdaQueryChainWrapper.eq(Dept::getIsDeleted,IsDeleteEnum.N.getKey());
-        if(ListUtil.isNotEmpty(regionDeptIds)){
-            lambdaQueryChainWrapper.notIn(Dept::getId,regionDeptIds);
-        }
         if(StringUtil.isNotEmpty(getDeptListVO.getDeptName())){
             lambdaQueryChainWrapper.like(Dept::getName,getDeptListVO.getDeptName());
         }
-        return lambdaQueryChainWrapper.select(Dept::getId,Dept::getName).list();
+        lambdaQueryChainWrapper.select(Dept::getId, Dept::getName).list().forEach(
+                obj->{
+                    DeptListDTO deptListDTO = new DeptListDTO();
+                    BeanUtils.copyProperties(obj,deptListDTO);
+                    deptListDTOS.add(deptListDTO);
+                }
+        );
+        return deptListDTOS;
     }
 }

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -112,7 +112,7 @@ public class UserManagementFacade {
         QueryWrapper<Role> roleQueryWrapper = new QueryWrapper<>();
         roleQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         roleQueryWrapper.eq("status", StatusEnum.Enable.getKey());
-        roleQueryWrapper.in("id", roleIdList);
+        roleQueryWrapper.in(ListUtil.isNotEmpty(roleIdList), "id", roleIdList);
         List<String> roleIdNames = roleFacade.list(roleQueryWrapper).stream().map(i -> i.getId() + "_" + i.getName()).collect(Collectors.toList());
 
         BeanUtils.copyProperties(user, userDTO);

security-center/src/main/java/com/lantone/security/web/DictionaryManagementController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description: 字典管理API
@@ -58,4 +59,11 @@ public class DictionaryManagementController {
     public CommonResult<Boolean> deleteDictionary(@RequestParam Integer id) {
         return CommonResult.success(dictionaryManagementFacade.deleteDictionary(id));
     }
+
+    @ApiOperation(value = "查看字典管理代码类别[by:cy]",
+            notes ="groupType:代码类别<br>")
+    @PostMapping("/getCodeCategory")
+    public CommonResult<List<String>> getCodeCategory(@RequestParam("groupType")String groupType) {
+        return CommonResult.success(dictionaryManagementFacade.getCodeCategory(groupType));
+    }
 }

security-center/src/main/java/com/lantone/security/web/HospitalSetManagementController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description: 参数管理API
@@ -55,7 +56,14 @@ public class HospitalSetManagementController {
             notes = "id:参数id，必填<br>")
     @PostMapping("/deleteHospitalSet")
     @Transactional
-    public CommonResult<Boolean> deleteHospitalSet(@RequestParam Integer id) {
-        return CommonResult.success(hospitalSetManagementFacade.deleteDictionary(id));
+    public CommonResult<Boolean> deleteHospitalSet(@RequestParam("id") Integer id) {
+        return CommonResult.success(hospitalSetManagementFacade.deleteHospitalSet(id));
+    }
+
+    @ApiOperation(value = "查看参数管理所属组织[by:cy]",
+            notes = "hospitalName:所属组织<br>")
+    @PostMapping("/getHospitalNames")
+    public CommonResult<List<String>> getHospitalNames(@RequestParam("hospitalName") String hospitalName) {
+        return CommonResult.success(hospitalSetManagementFacade.getHospitalNames(hospitalName));
     }
 }

security-center/src/main/java/com/lantone/security/web/RegionManagementController.java

@@ -2,12 +2,12 @@ package com.lantone.security.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
+import com.lantone.common.dto.DeptListDTO;
 import com.lantone.common.dto.ViewRegionDTO;
 import com.lantone.common.vo.CheckSolveRegionVO;
 import com.lantone.common.vo.GetDeptListVO;
 import com.lantone.common.vo.GetRegionVO;
 import com.lantone.common.vo.SaveRegionVO;
-import com.lantone.dblayermbg.entity.Dept;
 import com.lantone.security.facade.RegionManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -82,7 +82,7 @@ public class RegionManagementController {
     @ApiOperation(value = "获取科室列表[by:cy]",
             notes = "标记（0-返回科室列表 1-返回互斥科室列表），必填<br>")
     @PostMapping("/getDeptList")
-    public CommonResult<List<Dept>> getDeptList(@RequestBody @Valid GetDeptListVO getDeptListVO) {
+    public CommonResult<List<DeptListDTO>> getDeptList(@RequestBody GetDeptListVO getDeptListVO) {
         return CommonResult.success(sysRegionFacade.getDept(getDeptListVO));
     }
 }