代码规范

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

@@ -2,6 +2,8 @@ package com.lantone.common.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+
 
 /**
  * @Description:
@@ -9,7 +11,7 @@ import lombok.Data;
  * @time: 2021/7/29 11:31
  */
 @Data
-public class ReRegionVO {
+public class CheckSolveRegionVO {
     @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
@@ -17,8 +19,10 @@ public class ReRegionVO {
     private String name;
 
     @ApiModelProperty(value = "病区id")
+    @NotEmpty(message ="病区id不能为空" )
     private Integer id;
 
     @ApiModelProperty(value = "0-禁用校验标识 1-禁用此病区")
+    @NotEmpty(message ="操作标识不能为空" )
     private Integer mark = 0;
 }

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
 
 
 @Data
-public class ViewDictionaryInfoVO implements Serializable {
+public class GetDictionaryVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -13,7 +13,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ViewRegionVO extends Page {
+public class GetRegionVO extends Page {
     @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 

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

@@ -2,6 +2,7 @@ package com.lantone.common.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 
@@ -18,23 +19,24 @@ public class SaveDictionaryVO implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
-    @ApiModelProperty(value = "分组（值自定义）")
+    @ApiModelProperty(value = "代码类别")
+    @NotEmpty(message = "代码类别不能为空")
     private Long groupType;
 
-    @ApiModelProperty(value = "内容")
-    @NotBlank
+    @ApiModelProperty(value = "代码名称")
+    @NotBlank(message = "代码名称不能为空")
     private String name;
 
-    @ApiModelProperty(value = "值")
-    @NotBlank
+    @ApiModelProperty(value = "字典编码")
+    @NotBlank(message = "字典编码不能为空")
     private String val;
 
     @ApiModelProperty(value = "是否启用(0-否 1-是)")
-    @NotBlank
+    @NotEmpty(message = "是否启用不能为空")
     private Long status;
 
-    @ApiModelProperty(value = "备注")
-    @NotBlank
+    @ApiModelProperty(value = "字典说明")
+    @NotBlank(message = "字典说明不能为空")
     private String remark;
 
 

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

@@ -22,35 +22,32 @@ import java.util.List;
     private Long hospitalId;
 
     @ApiModelProperty(value = "医院名称")
-    @NotBlank
+    @NotBlank(message = "医院名称不能为空")
     private String hospitalName;
 
     @ApiModelProperty(value = "联系人")
-    @NotBlank
     private String liaison;
 
     @ApiModelProperty(value = "手机号码")
-    @NotBlank
     private String phoneNumber;
 
     @ApiModelProperty(value = "病区编码")
     private String code;
 
     @ApiModelProperty(value = "病区名称")
-    @NotBlank
+    @NotBlank(message = "病区名称不能为空")
     private String name;
 
     @ApiModelProperty(value = "首字母拼音")
     private String spell;
 
     @ApiModelProperty(value = "区域类别")
-    @NotBlank
+    @NotBlank(message = "区域类别不能为空")
     private String station;
 
     @ApiModelProperty(value = "排序")
     private String orderNo;
 
-
     @ApiModelProperty(value = "科室id集合")
     private List<Long> deptIds;
 

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RegionFacade.java

@@ -2,7 +2,7 @@ package com.lantone.dblayermbg.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.dto.ViewRegionDTO;
-import com.lantone.common.vo.ViewRegionVO;
+import com.lantone.common.vo.GetRegionVO;
 import com.lantone.dblayermbg.service.impl.RegionServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -14,8 +14,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class RegionFacade extends RegionServiceImpl {
 
-    public IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO) {
-        return this.baseMapper.getWard(viewRegionVO);
+    public IPage<ViewRegionDTO> getWard(GetRegionVO getRegionVO) {
+        return this.baseMapper.getWard(getRegionVO);
     }
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RegionMapper.java

@@ -3,7 +3,7 @@ package com.lantone.dblayermbg.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.dto.ViewRegionDTO;
-import com.lantone.common.vo.ViewRegionVO;
+import com.lantone.common.vo.GetRegionVO;
 import com.lantone.dblayermbg.entity.Region;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -15,5 +15,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface RegionMapper extends BaseMapper<Region> {
-    IPage<ViewRegionDTO> getWard(@Param("viewRegionVO") ViewRegionVO viewRegionVO);
+    IPage<ViewRegionDTO> getWard(@Param("getRegionVO") GetRegionVO getRegionVO);
 }

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQu
 import com.lantone.common.exception.ApiException;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.vo.SaveDictionaryVO;
-import com.lantone.common.vo.ViewDictionaryInfoVO;
+import com.lantone.common.vo.GetDictionaryVO;
 import com.lantone.dblayermbg.entity.DictionaryInfo;
 import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
 import org.springframework.beans.BeanUtils;
@@ -26,6 +26,13 @@ public class DictionaryInfoManagementFacade{
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
 
+    /**
+     * @Description: 新增/修改字典
+     * @Param: [saveDictionaryVO]
+     * @return: java.lang.Object
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public Object saveDictionary(SaveDictionaryVO saveDictionaryVO) {
         Boolean flag = false;
         //新增-校验重复数据
@@ -40,24 +47,44 @@ public class DictionaryInfoManagementFacade{
         return flag;
     }
 
-
-    public IPage<DictionaryInfo> getDictionary(ViewDictionaryInfoVO viewDictionaryInfoVO) {
+    /**
+     * @Description: 查看字典管理
+     * @Param: [getDictionaryVO]
+     * @return: IPage<com.lantone.dblayermbg.entity.DictionaryInfo>
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public IPage<DictionaryInfo> getDictionary(GetDictionaryVO getDictionaryVO) {
         IPage<DictionaryInfo> pageInfo = new Page();
         LambdaQueryChainWrapper<DictionaryInfo> dictionaryInfoLambdaQuery = dictionaryInfoFacade.lambdaQuery();
-        if (StringUtil.isNotEmpty(viewDictionaryInfoVO.getName())) {
-            dictionaryInfoLambdaQuery.like(DictionaryInfo::getName, viewDictionaryInfoVO.getName());
+        if (StringUtil.isNotEmpty(getDictionaryVO.getName())) {
+            dictionaryInfoLambdaQuery.like(DictionaryInfo::getName, getDictionaryVO.getName());
         }
-        if (null != viewDictionaryInfoVO.getGroupType()) {
-            dictionaryInfoLambdaQuery.like(DictionaryInfo::getGroupType, viewDictionaryInfoVO.getGroupType());
+        if (null != getDictionaryVO.getGroupType()) {
+            dictionaryInfoLambdaQuery.like(DictionaryInfo::getGroupType, getDictionaryVO.getGroupType());
         }
         IPage<DictionaryInfo> page = dictionaryInfoLambdaQuery.page(pageInfo);
         return page;
     }
 
-    public Boolean deletDictionary(ViewDictionaryInfoVO deleteDictionaryInfoVO) {
-        return dictionaryInfoFacade.lambdaUpdate().eq(DictionaryInfo::getId, deleteDictionaryInfoVO.getId()).remove();
-    }
+    /**
+     * @Description: 删除字典管理
+     * @Param: [id]
+     * @return: java.lang.Boolean
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public Boolean deletDictionary(Integer id) {
+        return dictionaryInfoFacade.lambdaUpdate().eq(DictionaryInfo::getId,id).remove();}
 
+
+    /**
+     * @Description: 新增-校验重复数据
+     * @Param: [saveDictionaryVO]
+     * @return: void
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public void checkDictionary(SaveDictionaryVO saveDictionaryVO) {
         if (null == saveDictionaryVO.getId()) {
             Integer count = dictionaryInfoFacade.lambdaQuery()
@@ -70,12 +97,25 @@ public class DictionaryInfoManagementFacade{
         }
     }
 
+    /**
+     * @Description: 新增字典
+     * @Param: [dictionaryInfo]
+     * @return: java.lang.Boolean
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public Boolean addDictionary(DictionaryInfo dictionaryInfo) {
         dictionaryInfo.setGmtCreate(new Date());
         dictionaryInfo.setCreator("程瑶-后期改");
         return dictionaryInfoFacade.save(dictionaryInfo);
     }
-
+    /**
+     * @Description: 修改字典
+     * @Param: [dictionaryInfo]
+     * @return: java.lang.Boolean
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public Boolean updateDictionary(DictionaryInfo dictionaryInfo) {
         dictionaryInfo.setGmtModified(new Date());
         dictionaryInfo.setModifier("程瑶改");

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

@@ -6,9 +6,9 @@ import com.lantone.common.dto.ViewRegionDTO;
 import com.lantone.common.exception.ApiException;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
-import com.lantone.common.vo.ReRegionVO;
+import com.lantone.common.vo.CheckSolveRegionVO;
 import com.lantone.common.vo.SaveRegionVO;
-import com.lantone.common.vo.ViewRegionVO;
+import com.lantone.common.vo.GetRegionVO;
 import com.lantone.dblayermbg.entity.Region;
 import com.lantone.dblayermbg.entity.RegionDept;
 import com.lantone.dblayermbg.facade.RegionFacade;
@@ -36,6 +36,13 @@ public class RegionManagementFacade {
     @Autowired
     private RegionFacade regionFacade;
 
+    /**
+     * @Description: 新增/修改病区
+     * @Param: [saveRegionVo]
+     * @return: java.lang.Object
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public Object saveRegion(SaveRegionVO saveRegionVo) {
         Boolean flag = false;
         //新增-校验重复数据
@@ -51,15 +58,21 @@ public class RegionManagementFacade {
         return flag;
     }
 
-
-    public IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO) {
-        IPage<ViewRegionDTO> page = regionFacade.getWard(viewRegionVO);
+    /**
+     * @Description: 查看病区管理
+     * @Param: [getRegionVO]
+     * @return: IPage<com.lantone.common.dto.ViewRegionDTO>
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public IPage<ViewRegionDTO> getWard(GetRegionVO getRegionVO) {
+        IPage<ViewRegionDTO> page = regionFacade.getWard(getRegionVO);
         List<ViewRegionDTO> wardList = page.getRecords();
-        if (ListUtil.isNotEmpty(wardList) && StringUtil.isNotEmpty(viewRegionVO.getDeptName())) {
+        if (ListUtil.isNotEmpty(wardList) && StringUtil.isNotEmpty(getRegionVO.getDeptName())) {
             IPage pageOne = new Page();
             List<ViewRegionDTO> viewRegionDTOS = new ArrayList<>();
             wardList.forEach(obj -> {
-                if (StringUtil.isNotEmpty(obj.getDeptName()) && obj.getDeptName().contains(viewRegionVO.getDeptName())) {
+                if (StringUtil.isNotEmpty(obj.getDeptName()) && obj.getDeptName().contains(getRegionVO.getDeptName())) {
                     viewRegionDTOS.add(obj);
                 }
             });
@@ -69,18 +82,31 @@ public class RegionManagementFacade {
         return page;
     }
 
-
-    public Boolean deleteRegion(ReRegionVO reRegionVO) {
+    /**
+     * @Description: 删除病区管理
+     * @Param: [id]
+     * @return: java.lang.Boolean
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public Boolean deleteRegion(Integer id) {
+        Integer hospitalId = 4;
         regionFacade.lambdaUpdate()
-                .eq(Region::getId, reRegionVO.getId())
-                .eq(Region::getHospitalId, reRegionVO.getHospitalId()).remove();
+                .eq(Region::getId,id)
+                .eq(Region::getHospitalId, hospitalId).remove();
         boolean flag = regionDeptService.lambdaUpdate()
-                .eq(RegionDept::getRegionId, reRegionVO.getId())
-                .eq(RegionDept::getHospitalId, reRegionVO.getHospitalId()).remove();
+                .eq(RegionDept::getRegionId, id)
+                .eq(RegionDept::getHospitalId, hospitalId).remove();
         return flag;
     }
 
-
+    /**
+     * @Description: 新增-校验重复数据
+     * @Param: [saveRegionVo]
+     * @return: void
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public void getRegion(SaveRegionVO saveRegionVo) {
         if (null == saveRegionVo.getId()) {
             List<Long> collects = regionFacade.lambdaQuery()
@@ -99,7 +125,13 @@ public class RegionManagementFacade {
         }
     }
 
-
+    /**
+     * @Description: 新增病区
+     * @Param: [saveRegionVo, sysRegion, sysRegionDepts]
+     * @return: java.lang.Boolean
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public Boolean addRegion(SaveRegionVO saveRegionVo, Region sysRegion, List<RegionDept> sysRegionDepts) {
         sysRegion.setGmtCreate(new Date());
         sysRegion.setCreator("程瑶-后期改");
@@ -119,6 +151,13 @@ public class RegionManagementFacade {
         return true;
     }
 
+    /**
+     * @Description: 修改病区
+     * @Param: [saveRegionVo, sysRegion, sysRegionDepts]
+     * @return: java.lang.Boolean
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
     public Boolean updateRegion(SaveRegionVO saveRegionVo, Region sysRegion, List<RegionDept> sysRegionDepts) {
         sysRegion.setGmtModified(new Date());
         sysRegion.setModifier("程瑶改");
@@ -147,12 +186,19 @@ public class RegionManagementFacade {
         return true;
     }
 
-    public Object checkSolveRegion(ReRegionVO reRegionVO) {
+    /**
+     * @Description: 校验/禁用病区管理
+     * @Param: [checkSolveRegionVO]
+     * @return: java.lang.Object
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public Object checkSolveRegion(CheckSolveRegionVO checkSolveRegionVO) {
         //禁用校验
-        if (null != reRegionVO.getId() && 0 == reRegionVO.getMark()) {
+        if (null != checkSolveRegionVO.getId() && 0 == checkSolveRegionVO.getMark()) {
             List<Long> collectList = regionDeptService.lambdaQuery()
-                    .eq(RegionDept::getRegionId, reRegionVO.getId())
-                    .eq(RegionDept::getHospitalId, reRegionVO.getHospitalId())
+                    .eq(RegionDept::getRegionId, checkSolveRegionVO.getId())
+                    .eq(RegionDept::getHospitalId, checkSolveRegionVO.getHospitalId())
                     .list().stream().map(obj -> obj.getDeptId()).collect(Collectors.toList());
             if (ListUtil.isNotEmpty(collectList) && collectList.size() > 0) {
                 //当前病区存在与之关联的科室
@@ -162,10 +208,10 @@ public class RegionManagementFacade {
         }
 
         //禁用病区处理
-        if (null != reRegionVO.getId() && 1 == reRegionVO.getMark()) {
+        if (null != checkSolveRegionVO.getId() && 1 == checkSolveRegionVO.getMark()) {
             regionFacade.lambdaUpdate()
-                    .eq(Region::getId, reRegionVO.getId())
-                    .eq(Region::getHospitalId, reRegionVO.getHospitalId())
+                    .eq(Region::getId, checkSolveRegionVO.getId())
+                    .eq(Region::getHospitalId, checkSolveRegionVO.getHospitalId())
                     .set(Region::getStatus, 0).update();
         }
         return true;

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

@@ -3,7 +3,7 @@ package com.lantone.security.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.vo.SaveDictionaryVO;
-import com.lantone.common.vo.ViewDictionaryInfoVO;
+import com.lantone.common.vo.GetDictionaryVO;
 import com.lantone.dblayermbg.entity.DictionaryInfo;
 import com.lantone.security.facade.DictionaryInfoManagementFacade;
 import io.swagger.annotations.Api;
@@ -13,8 +13,10 @@ 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.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
 
 /**
  * @ClassName: DictionaryManagementController
@@ -25,7 +27,7 @@ import springfox.documentation.annotations.ApiIgnore;
  */
 @RestController
 @Api(value = "字典管理API", tags = { "字典管理API" })
-@RequestMapping("/dictionary/management")
+@RequestMapping("/dictionaryManage")
 public class DictionaryManagementController {
     @Autowired
     private DictionaryInfoManagementFacade dictionaryInfoFacade;
@@ -38,9 +40,8 @@ public class DictionaryManagementController {
                     "remark:字典说明，必填<br>" +
                     "status:是否启用，必填<br>")
     @PostMapping("/saveDictionary")
-    @ApiIgnore
     @Transactional
-    public CommonResult<Object> saveDictionary(@RequestBody SaveDictionaryVO saveDictionaryVO) {
+    public CommonResult<Object> saveDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
         return CommonResult.success(dictionaryInfoFacade.saveDictionary(saveDictionaryVO));
     }
 
@@ -48,17 +49,15 @@ public class DictionaryManagementController {
             notes = "name:代码名称，<br>" +
                     "groupType:代码类别，<br>")
     @PostMapping("/getDictionary")
-    @ApiIgnore
-    public CommonResult<IPage<DictionaryInfo>> getDictionary(@RequestBody ViewDictionaryInfoVO viewDictionaryInfoVO) {
-        return CommonResult.success(dictionaryInfoFacade.getDictionary(viewDictionaryInfoVO));
+    public CommonResult<IPage<DictionaryInfo>> getDictionary(@RequestBody GetDictionaryVO getDictionaryVO) {
+        return CommonResult.success(dictionaryInfoFacade.getDictionary(getDictionaryVO));
     }
 
     @ApiOperation(value = "删除字典管理[by:cy]",
-            notes = "id:<br>")
+            notes = "id:字典id，必填<br>")
     @PostMapping("/deletDictionary")
-    @ApiIgnore
     @Transactional
-    public CommonResult<Boolean> deletDictionary(@RequestBody ViewDictionaryInfoVO deletDictionaryInfoVO) {
-        return CommonResult.success(dictionaryInfoFacade.deletDictionary(deletDictionaryInfoVO));
+    public CommonResult<Boolean> deletDictionary(@RequestParam Integer id) {
+        return CommonResult.success(dictionaryInfoFacade.deletDictionary(id));
     }
 }

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

@@ -3,9 +3,9 @@ package com.lantone.security.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.ViewRegionDTO;
-import com.lantone.common.vo.ReRegionVO;
+import com.lantone.common.vo.CheckSolveRegionVO;
 import com.lantone.common.vo.SaveRegionVO;
-import com.lantone.common.vo.ViewRegionVO;
+import com.lantone.common.vo.GetRegionVO;
 import com.lantone.security.facade.RegionManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +14,10 @@ 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.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
 
 /**
  * @ClassName: RegionManagementController
@@ -41,21 +43,19 @@ public class RegionManagementController {
                     "orderNo:排序，<br>" +
                     "status:是否启用，<br>")
     @PostMapping("/saveRegion")
-    @ApiIgnore
     @Transactional
-    public CommonResult<Object> saveRegion(@RequestBody SaveRegionVO saveRegionVo) {
+    public CommonResult<Object> saveRegion(@RequestBody @Valid SaveRegionVO saveRegionVo) {
         return CommonResult.success(sysRegionFacade.saveRegion(saveRegionVo));
     }
 
     @ApiOperation(value = "校验/禁用病区管理[by:cy]",
             notes = "hospitalId:医院ID<br>" +
-                    "name:病区名称，必填<br>" +
+                    "name:病区名称<br>" +
                     "id:病区id，必填<br>" +
                     "mark:0-禁用校验标识 1-禁用此病区，必填<br>")
     @PostMapping("/checkSolveRegion")
-    @ApiIgnore
-    public CommonResult<Object> checkSolveRegion(@RequestBody ReRegionVO reRegionVO) {
-        return CommonResult.success(sysRegionFacade.checkSolveRegion(reRegionVO));
+    public CommonResult<Object> checkSolveRegion(@RequestBody @Valid CheckSolveRegionVO checkSolveRegionVO) {
+        return CommonResult.success(sysRegionFacade.checkSolveRegion(checkSolveRegionVO));
     }
 
 
@@ -65,20 +65,16 @@ public class RegionManagementController {
                     "deptName:关联科室，<br>" +
                     "status:启用状态 0-否 1-是 <br>")
     @PostMapping("/getRegion")
-    @ApiIgnore
-    public CommonResult<IPage<ViewRegionDTO>> getRegion(@RequestBody ViewRegionVO viewRegionVO) {
-        return CommonResult.success(sysRegionFacade.getWard(viewRegionVO));
+    public CommonResult<IPage<ViewRegionDTO>> getRegion(@RequestBody GetRegionVO getRegionVO) {
+        return CommonResult.success(sysRegionFacade.getWard(getRegionVO));
     }
 
 
     @ApiOperation(value = "删除病区管理[by:cy]",
-            notes = "hospitalId:医院ID<br>" +
-                    "name:病区名称，<br>" +
-                    "id:病区id，必填<br>")
+            notes =  "id:病区id，必填<br>")
     @PostMapping("/deleteRegion")
-    @ApiIgnore
     @Transactional
-    public CommonResult<Boolean> deleteRegion(@RequestBody ReRegionVO reRegionVO) {
-        return CommonResult.success(sysRegionFacade.deleteRegion(reRegionVO));
+    public CommonResult<Boolean> deleteRegion(@RequestParam Integer id) {
+        return CommonResult.success(sysRegionFacade.deleteRegion(id));
     }
 }