病区管理删除/查询

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

@@ -1,10 +1,9 @@
-package com.lantone.common.vo;
+package com.lantone.common.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.List;
 
@@ -14,7 +13,7 @@ import java.util.List;
  * </p>
  */
 @Data
-public class SysRegionVo implements Serializable {
+public class SysRegionDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -52,8 +51,7 @@ public class SysRegionVo implements Serializable {
     @ApiModelProperty(value = "排序")
     private String orderNo;
 
-    @ApiModelProperty(value = "科室id集合")
-    @NotEmpty
+    @ApiModelProperty(value = "关联科室id")
     private List<Long> deptIds;
 
     @ApiModelProperty(value = "备注")
@@ -62,7 +60,7 @@ public class SysRegionVo implements Serializable {
     @ApiModelProperty(value = "0-否 1-是")
     private Integer status;
 
-    @ApiModelProperty(value = "0-非禁用校验标识 1-禁用校验标识")
+    @ApiModelProperty(value = "0-非禁用校验标识 1-禁用校验标识 2-禁用此病区")
     private Integer mark = 0;
 
 

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

@@ -0,0 +1,34 @@
+package com.lantone.common.dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * <p>
+ * 病区表
+ * </p>
+ */
+@Data
+public class ViewRegionDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "医院名称")
+    @NotBlank
+    private String hospitalName;
+
+    @ApiModelProperty(value = "病区名称")
+    @NotBlank
+    private String name;
+
+    @ApiModelProperty(value = "关联科室")
+    private String deptName;
+
+    @ApiModelProperty(value = "启用状态 0-否 1-是")
+    private String status;
+
+    private Date gmtCreate;
+
+}

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

@@ -0,0 +1,24 @@
+package com.lantone.common.vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @Description:
+ * @Author: cy
+ * @time: 2021/7/29 11:31
+ */
+@Data
+public class ReRegionVO {
+    @ApiModelProperty(value = "医院ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "病区名称")
+    private String name;
+
+    @ApiModelProperty(value = "病区id")
+    private Integer id;
+
+    @ApiModelProperty(value = "0-禁用校验标识 1-禁用此病区")
+    private Integer mark = 0;
+}

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

@@ -0,0 +1,62 @@
+package com.lantone.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 病区表
+ * </p>
+ */
+@Data
+ public class SaveRegionVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "医院ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院名称")
+    @NotBlank
+    private String hospitalName;
+
+    @ApiModelProperty(value = "联系人")
+    @NotBlank
+    private String liaison;
+
+    @ApiModelProperty(value = "手机号码")
+    @NotBlank
+    private String phoneNumber;
+
+    @ApiModelProperty(value = "病区编码")
+    private String code;
+
+    @ApiModelProperty(value = "病区名称")
+    @NotBlank
+    private String name;
+
+    @ApiModelProperty(value = "首字母拼音")
+    private String spell;
+
+    @ApiModelProperty(value = "区域类别")
+    @NotBlank
+    private String station;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+
+    @ApiModelProperty(value = "科室id集合")
+    private List<Long> deptIds;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "启用状态 0-否 1-是")
+    private Integer status;
+}

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

@@ -0,0 +1,28 @@
+package com.lantone.common.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * @Description:
+ * @Author: cy
+ * @time: 2021/7/29 11:31
+ */
+@Getter
+@Setter
+public class ViewRegionVO extends Page {
+    @ApiModelProperty(value = "医院ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "关联科室")
+    private String deptName;
+
+    @ApiModelProperty(value = "病区名称")
+    private String name;
+
+    @ApiModelProperty(value = "启用状态 0-否 1-是")
+    private Integer status;
+}

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

@@ -1,19 +1,8 @@
 package com.lantone.dblayermbg.facade;
 
-import com.lantone.common.exception.ApiException;
-import com.lantone.common.util.ListUtil;
-import com.lantone.common.vo.SysRegionVo;
-import com.lantone.dblayermbg.entity.SysRegion;
-import com.lantone.dblayermbg.entity.SysRegionDept;
-import com.lantone.dblayermbg.service.impl.SysRegionDeptServiceImpl;
 import com.lantone.dblayermbg.service.impl.SysRegionServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  * 病区表 服务实现类Facade
@@ -21,96 +10,5 @@ import java.util.stream.Collectors;
  */
 @Component
 public class SysRegionFacade extends SysRegionServiceImpl {
-    @Autowired
-    private SysRegionDeptServiceImpl sysRegionDeptServiceImpl;
-    public Object saveWard(SysRegionVo sysRegionVo){
-        Boolean flag = false;
-        //校验病区和科室
-        Object sysRegionObj = getSysRegion(sysRegionVo);
-       if("1".equals(sysRegionObj.toString()) || "0".equals(sysRegionObj.toString())){
-           return sysRegionObj;
-       }
-        SysRegion sysRegion = new SysRegion();
-        BeanUtils.copyProperties(sysRegionVo,sysRegion);
-        List<SysRegionDept> sysRegionDepts = new ArrayList<>();
-        if(null == sysRegionVo.getId()){
-            flag = addSysRegion(sysRegionVo, sysRegion, sysRegionDepts);
-        }else if(null != sysRegionVo.getId()){
-            flag = updateSysRegion(sysRegionVo, sysRegion,sysRegionDepts);
-        }
-        return flag;
-    };
-
-    public Object getSysRegion(SysRegionVo sysRegionVo){
-        //禁用校验
-        if(null != sysRegionVo.getId() && 1 == sysRegionVo.getMark()){
-            List<Long> collectList = sysRegionDeptServiceImpl.lambdaQuery()
-                    .eq(SysRegionDept::getRegionId, sysRegionVo.getId())
-                    .list().stream().map(obj -> obj.getDeptId()).collect(Collectors.toList());
-            if(ListUtil.isNotEmpty(collectList) && collectList.size()>0){
-                //当前病区存在与之关联的科室
-                return 1;
-            }
-                return 0;
-        }
-
-        //新增-校验重复数据
-        if(null == sysRegionVo.getId()){
-            List<Long> collects = this.lambdaQuery()
-                    .eq(SysRegion::getName, sysRegionVo.getName())
-                    .eq(SysRegion::getHospitalId, sysRegionVo.getHospitalId()).list().stream().map(obj -> obj.getId()).collect(Collectors.toList());
-            if(ListUtil.isNotEmpty(collects)){
-                Integer count = sysRegionDeptServiceImpl.lambdaQuery()
-                        .in(SysRegionDept::getRegionId,collects)
-                        .in(SysRegionDept::getDeptId, sysRegionVo.getDeptIds()).count();
-                if(count>0){
-                    throw new ApiException("当前病区关联科室重复");
-                }
-            }
-        }
-        return true;
-    }
-
-    public Boolean addSysRegion(SysRegionVo sysRegionVo,SysRegion sysRegion ,List<SysRegionDept> sysRegionDepts){
-        sysRegion.setGmtCreate(new Date());
-        sysRegion.setCreator("程瑶-后期改");
-        this.save(sysRegion);
-        sysRegionVo.getDeptIds().forEach(obj->{
-            SysRegionDept sysRegionDept = new SysRegionDept();
-            BeanUtils.copyProperties(sysRegionVo,sysRegionDept);
-            sysRegionDept.setDeptId(obj);
-            sysRegionDept.setRegionId(sysRegion.getId());
-            sysRegionDept.setGmtCreate(new Date());
-            sysRegionDept.setCreator("后期修改");
-            sysRegionDepts.add(sysRegionDept);
-        });
-        Boolean flag = sysRegionDeptServiceImpl.saveBatch(sysRegionDepts);
-        return flag;
-    }
 
-    public Boolean updateSysRegion(SysRegionVo sysRegionVo,SysRegion sysRegion,List<SysRegionDept> sysRegionDepts){
-        sysRegion.setGmtModified(new Date());
-        sysRegion.setModifier("程瑶改");
-        this.updateById(sysRegion);
-        List<SysRegion> list = this.lambdaQuery().eq(SysRegion::getId, sysRegionVo.getId()).list();
-        sysRegionDeptServiceImpl.lambdaUpdate()
-                .eq(SysRegionDept::getHospitalId, sysRegionVo.getHospitalId())
-                .eq(SysRegionDept::getRegionId, sysRegionVo.getId()).remove();
-        sysRegionVo.getDeptIds().forEach(obj->{
-            SysRegionDept sysRegionDeptEntry = new SysRegionDept();
-            BeanUtils.copyProperties(sysRegionVo,sysRegionDeptEntry);
-            sysRegionDeptEntry.setId(null);
-            sysRegionDeptEntry.setDeptId(obj);
-            sysRegionDeptEntry.setRegionId(sysRegionVo.getId());
-            if(ListUtil.isNotEmpty(list)){
-                sysRegionDeptEntry.setGmtCreate(list.get(0).getGmtCreate());
-                sysRegionDeptEntry.setCreator(list.get(0).getCreator());
-            }
-            sysRegionDeptEntry.setGmtModified(new Date());
-            sysRegionDeptEntry.setModifier("后期修改");
-            sysRegionDepts.add(sysRegionDeptEntry);
-        });
-        Boolean flag = sysRegionDeptServiceImpl.saveBatch(sysRegionDepts);
-        return flag;
-    }
 }

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

@@ -1,14 +1,20 @@
 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.dblayermbg.entity.SysRegion;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
  * 病区表 Mapper 接口
  * </p>
  */
+@Repository
 public interface SysRegionMapper extends BaseMapper<SysRegion> {
-
+    IPage<ViewRegionDTO> getWard(@Param("viewRegionVO")ViewRegionVO viewRegionVO);
 }
 

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/SysRegionService.java

@@ -1,13 +1,18 @@
 package com.lantone.dblayermbg.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.common.dto.ViewRegionDTO;
+import com.lantone.common.vo.ViewRegionVO;
 import com.lantone.dblayermbg.entity.SysRegion;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
  * 病区表 服务类
  * </p>
  */
+@Service
 public interface SysRegionService extends IService<SysRegion> {
-
+    IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO);
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/SysRegionServiceImpl.java

@@ -1,9 +1,13 @@
 package com.lantone.dblayermbg.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.common.dto.ViewRegionDTO;
+import com.lantone.common.vo.ViewRegionVO;
 import com.lantone.dblayermbg.entity.SysRegion;
 import com.lantone.dblayermbg.mapper.SysRegionMapper;
 import com.lantone.dblayermbg.service.SysRegionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +17,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysRegionServiceImpl extends ServiceImpl<SysRegionMapper, SysRegion> implements SysRegionService {
-
+    @Autowired
+    private SysRegionMapper sysRegionMapper;
+    @Override
+    public IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO) {
+        return sysRegionMapper.getWard(viewRegionVO);
+    }
 }

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

@@ -1,5 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.SysRegionMapper">
+    <select id="getWard"  resultType="com.lantone.common.dto.ViewRegionDTO">
+        select t1.name,t1.hospital_name as hospitalName,t2.deptName,
+        case t1.status
+        when  1 then '启用'
+        when  0 then '禁用'end as status,
+        t1.gmt_create as gmtCreate
+        from sys_region t1 LEFT JOIN
+           (select a.hospital_id,a.region_id,GROUP_CONCAT(b.name)as deptName
+            from sys_region_dept a,sys_dept b
+            where
+            a.is_deleted = 'N'
+            and b.is_deleted = 'N'
+            and a.hospital_id = b.hospital_id
+            and a.dept_id = b.id
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+            GROUP BY a.region_id
+            )t2
+        on t1.hospital_id = t2.hospital_id
+        and t1.id = t2.region_id
+        where
+        t1.is_deleted = 'N'
+        <if test='hospitalId != null and hospitalId != ""'>
+            AND t1.hospital_id = #{hospitalId}
+        </if>
+        <if test='name != null and name != ""'>
+            and t1.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test='status != null and status != ""'>
+            and t2.status like CONCAT('%',#{status},'%')
+        </if>
+    </select>
 
 </mapper>

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

@@ -0,0 +1,176 @@
+package com.lantone.security.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.SaveRegionVO;
+import com.lantone.common.vo.ViewRegionVO;
+import com.lantone.dblayermbg.entity.SysRegion;
+import com.lantone.dblayermbg.entity.SysRegionDept;
+import com.lantone.dblayermbg.service.SysRegionDeptService;
+import com.lantone.dblayermbg.service.SysRegionService;
+import com.lantone.dblayermbg.service.impl.SysRegionServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 病区表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class RegionManagementFacade extends SysRegionServiceImpl {
+    @Autowired
+    @Qualifier("sysRegionDeptServiceImpl")
+    private SysRegionDeptService sysRegionDeptService;
+
+    @Autowired
+    @Qualifier("sysRegionServiceImpl")
+    private SysRegionService sysRegionService;
+
+    public Object saveRegion(SaveRegionVO saveRegionVo) {
+        Boolean flag = false;
+        //新增-校验重复数据
+        getSysRegion(saveRegionVo);
+        SysRegion sysRegion = new SysRegion();
+        BeanUtils.copyProperties(saveRegionVo, sysRegion);
+        List<SysRegionDept> sysRegionDepts = new ArrayList<>();
+        if (null == saveRegionVo.getId()) {
+            flag = addSysRegion(saveRegionVo, sysRegion, sysRegionDepts);
+        } else if (null != saveRegionVo.getId()) {
+            flag = updateSysRegion(saveRegionVo, sysRegion, sysRegionDepts);
+        }
+        return flag;
+    }
+
+
+    public IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO) {
+        IPage<ViewRegionDTO> page = sysRegionService.getWard(viewRegionVO);
+        List<ViewRegionDTO> wardList = page.getRecords();
+        if (ListUtil.isNotEmpty(wardList) && StringUtil.isNotEmpty(viewRegionVO.getDeptName())) {
+            IPage pageOne = new Page();
+            List<ViewRegionDTO> viewRegionDTOS = new ArrayList<>();
+            wardList.forEach(obj -> {
+                if (StringUtil.isNotEmpty(obj.getDeptName()) && obj.getDeptName().contains(viewRegionVO.getDeptName())) {
+                    viewRegionDTOS.add(obj);
+                }
+            });
+            pageOne.setRecords(viewRegionDTOS);
+            return pageOne;
+        }
+        return page;
+    }
+
+
+    public Boolean deleteRegion(ReRegionVO reRegionVO) {
+        this.lambdaUpdate()
+                .eq(SysRegion::getId, reRegionVO.getId())
+                .eq(SysRegion::getHospitalId, reRegionVO.getHospitalId()).remove();
+        boolean flag = sysRegionDeptService.lambdaUpdate()
+                .eq(SysRegionDept::getRegionId, reRegionVO.getId())
+                .eq(SysRegionDept::getHospitalId, reRegionVO.getHospitalId()).remove();
+        return flag;
+    }
+
+
+    public void getSysRegion(SaveRegionVO saveRegionVo) {
+        if (null == saveRegionVo.getId()) {
+            List<Long> collects = this.lambdaQuery()
+                    .eq(SysRegion::getName, saveRegionVo.getName())
+                    .eq(SysRegion::getHospitalId, saveRegionVo.getHospitalId())
+                    .list().stream().map(obj -> obj.getId()).collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(collects) && ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
+                Integer count = sysRegionDeptService.lambdaQuery()
+                        .eq(SysRegionDept::getHospitalId, saveRegionVo.getHospitalId())
+                        .in(SysRegionDept::getRegionId, collects)
+                        .in(SysRegionDept::getDeptId, saveRegionVo.getDeptIds()).count();
+                if (count > 0) {
+                    throw new ApiException("当前病区关联科室重复");
+                }
+            }
+        }
+    }
+
+
+    public Boolean addSysRegion(SaveRegionVO saveRegionVo, SysRegion sysRegion, List<SysRegionDept> sysRegionDepts) {
+        sysRegion.setGmtCreate(new Date());
+        sysRegion.setCreator("程瑶-后期改");
+        this.save(sysRegion);
+        if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
+            saveRegionVo.getDeptIds().forEach(obj -> {
+                SysRegionDept sysRegionDept = new SysRegionDept();
+                BeanUtils.copyProperties(saveRegionVo, sysRegionDept);
+                sysRegionDept.setDeptId(obj);
+                sysRegionDept.setRegionId(sysRegion.getId());
+                sysRegionDept.setGmtCreate(new Date());
+                sysRegionDept.setCreator("后期修改");
+                sysRegionDepts.add(sysRegionDept);
+            });
+            return sysRegionDeptService.saveBatch(sysRegionDepts);
+        }
+        return true;
+    }
+
+    public Boolean updateSysRegion(SaveRegionVO saveRegionVo, SysRegion sysRegion, List<SysRegionDept> sysRegionDepts) {
+        sysRegion.setGmtModified(new Date());
+        sysRegion.setModifier("程瑶改");
+        this.updateById(sysRegion);
+        if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
+            List<SysRegion> list = this.lambdaQuery().eq(SysRegion::getId, saveRegionVo.getId()).list();
+            sysRegionDeptService.lambdaUpdate()
+                    .eq(SysRegionDept::getHospitalId, saveRegionVo.getHospitalId())
+                    .eq(SysRegionDept::getRegionId, saveRegionVo.getId()).remove();
+            saveRegionVo.getDeptIds().forEach(obj -> {
+                SysRegionDept sysRegionDeptEntry = new SysRegionDept();
+                BeanUtils.copyProperties(saveRegionVo, sysRegionDeptEntry);
+                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());
+                }
+                sysRegionDeptEntry.setGmtModified(new Date());
+                sysRegionDeptEntry.setModifier("后期修改");
+                sysRegionDepts.add(sysRegionDeptEntry);
+            });
+            return sysRegionDeptService.saveBatch(sysRegionDepts);
+        }
+        return true;
+    }
+
+    public Object checkSolveRegion(ReRegionVO reRegionVO) {
+        //禁用校验
+        if (null != reRegionVO.getId() && 0 == reRegionVO.getMark()) {
+            List<Long> collectList = sysRegionDeptService.lambdaQuery()
+                    .eq(SysRegionDept::getRegionId, reRegionVO.getId())
+                    .eq(SysRegionDept::getHospitalId, reRegionVO.getHospitalId())
+                    .list().stream().map(obj -> obj.getDeptId()).collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(collectList) && collectList.size() > 0) {
+                //当前病区存在与之关联的科室
+                return 1;
+            }
+            return 0;
+        }
+
+        //禁用病区处理
+        if (null != reRegionVO.getId() && 1 == reRegionVO.getMark()) {
+            this.lambdaUpdate()
+                    .eq(SysRegion::getId, reRegionVO.getId())
+                    .eq(SysRegion::getHospitalId, reRegionVO.getHospitalId())
+                    .set(SysRegion::getStatus, 0).update();
+        }
+        return true;
+    }
+}

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

@@ -1,43 +0,0 @@
-package com.lantone.security.web;
-
-import com.lantone.common.api.CommonResult;
-import com.lantone.common.vo.SysRegionVo;
-import com.lantone.dblayermbg.facade.SysRegionFacade;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-/**
- * @ClassName: DataWardController
- * @Description: 病区管理
- * @Author cy
- * @Date 2021/7/27
- * @Version 1.0
- */
-@RestController
-@Api(value = "病区管理API", tags = { "病区管理API" })
-@RequestMapping("/data/ward")
-public class DataWardController {
-    @Autowired
-    private SysRegionFacade sysRegionFacade;
-    @ApiOperation(value = "新增/修改病区[by:cy]",
-            notes =  "organizationName:上级组织名称，必填<br>" +
-                    "name:病区名称，必填<br>" +
-                    "code:病区编码，<br>" +
-                    "deptIds:关联科室，<br>" +
-                    "station:区域类别，必填<br>" +
-                    "orderNo:排序，<br>"+
-                    "status:是否启用，<br>")
-    @PostMapping("/saveWard")
-    @ApiIgnore
-    @Transactional
-    public CommonResult<Object> saveWard(@RequestBody SysRegionVo sysRegionVo) {
-        return CommonResult.success(sysRegionFacade.saveWard(sysRegionVo));
-    }
-}

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

@@ -0,0 +1,83 @@
+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.SaveRegionVO;
+import com.lantone.common.vo.ViewRegionVO;
+import com.lantone.security.facade.RegionManagementFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * @ClassName: DataWardController
+ * @Description: 病区管理
+ * @Author cy
+ * @Date 2021/7/27
+ * @Version 1.0
+ */
+@RestController
+@Api(value = "病区管理API", tags = { "病区管理API" })
+@RequestMapping("/region/management")
+public class RegionManagementController {
+    @Autowired
+    private RegionManagementFacade sysRegionFacade;
+
+    @ApiOperation(value = "新增/修改病区[by:cy]",
+            notes = "organizationName:上级组织名称，必填<br>" +
+                    "name:病区名称，必填<br>" +
+                    "code:病区编码，<br>" +
+                    "deptIds:关联科室，<br>" +
+                    "station:区域类别，必填<br>" +
+                    "orderNo:排序，<br>" +
+                    "status:是否启用，<br>")
+    @PostMapping("/saveRegion")
+    @ApiIgnore
+    @Transactional
+    public CommonResult<Object> saveRegion(@RequestBody SaveRegionVO saveRegionVo) {
+        return CommonResult.success(sysRegionFacade.saveRegion(saveRegionVo));
+    }
+
+    @ApiOperation(value = "校验/禁用病区管理[by:cy]",
+            notes = "hospitalId:医院ID<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));
+    }
+
+
+    @ApiOperation(value = "查看病区管理[by:cy]",
+            notes = "hospitalId:医院ID<br>" +
+                    "name:病区名称，<br>" +
+                    "deptName:关联科室，<br>" +
+                    "status:启用状态 0-否 1-是 <br>")
+    @PostMapping("/getRegion")
+    @ApiIgnore
+    public CommonResult<IPage<ViewRegionDTO>> getRegion(@RequestBody ViewRegionVO viewRegionVO) {
+        return CommonResult.success(sysRegionFacade.getWard(viewRegionVO));
+    }
+
+
+    @ApiOperation(value = "删除病区管理[by:cy]",
+            notes = "hospitalId:医院ID<br>" +
+                    "name:病区名称，<br>" +
+                    "id:病区id，必填<br>")
+    @PostMapping("/deleteRegion")
+    @ApiIgnore
+    @Transactional
+    public CommonResult<Boolean> deleteRegion(@RequestBody ReRegionVO reRegionVO) {
+        return CommonResult.success(sysRegionFacade.deleteRegion(reRegionVO));
+    }
+}