Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/common/config/exception/BusinessException.java

@@ -1,57 +0,0 @@
-package com.imed.costaccount.common.config.exception;
-
-
-import com.imed.costaccount.constants.CommonConstant;
-import com.imed.costaccount.enums.ErrorCodeEnum;
-import com.imed.costaccount.enums.ResponseCodeEnum;
-
-/**
- * @Description: 基类异常信息
- */
-public class BusinessException extends RuntimeException {
-
-    private String code;
-
-    private String message;
-
-    public BusinessException(String code, String message) {
-        super(message);
-        this.code = code;
-        this.message = message;
-    }
-
-    public BusinessException(String message) {
-        super(message);
-        this.code = CommonConstant.ERROR;
-        this.message = message;
-    }
-
-    /**
-     * 自定义异常
-     * @param enums 异常的枚举类型
-     */
-    public BusinessException(ErrorCodeEnum enums) {
-        super(enums.getDescription());
-        this.code = enums.getCode();
-        this.message = enums.getDescription();
-    }
-
-    /**
-     * 自定义的系统异常类型
-     * @param enums
-     */
-    public BusinessException(ResponseCodeEnum enums) {
-        super(enums.getMessage());
-        this.code = enums.getCode();
-        this.message = enums.getMessage();
-    }
-
-	public String getCode() {
-		return code;
-	}
-
-	@Override
-	public String getMessage() {
-		return message;
-	}
-}

src/main/java/com/imed/costaccount/mapper/DepartmentMapper.java

@@ -0,0 +1,16 @@
+package com.imed.costaccount.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.imed.costaccount.model.Department;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 科室表
+ * 
+ * @author KCYG
+ * @date 2021-07-27 08:49:37
+ */
+@Mapper
+public interface DepartmentMapper extends BaseMapper<Department> {
+	
+}

src/main/java/com/imed/costaccount/mapper/HosptailMapper.java

@@ -1,7 +1,7 @@
 package com.imed.costaccount.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.imed.costaccount.model.Hosptail;
+import com.imed.costaccount.model.Hospital;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-07-26 08:52:56
  */
 @Mapper
-public interface HosptailMapper extends BaseMapper<Hosptail> {
+public interface HosptailMapper extends BaseMapper<Hospital> {
 	
 }

src/main/java/com/imed/costaccount/model/Department.java

@@ -0,0 +1,57 @@
+package com.imed.costaccount.model;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 科室表
+ * 
+ * @author KCYG
+ * @email KCYG@xinxicom
+ * @date 2021-07-27 08:49:37
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("sys_department")
+public class Department implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 科室Id
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 科室名称
+	 */
+	private String departmentName;
+	/**
+	 * 科室代码
+	 */
+	private String departmentCode;
+	/**
+	 * 医院或院区Id
+	 */
+	private Integer hospId;
+	/**
+	 * 创建时间13位时间戳
+	 */
+	private Long createTime;
+	/**
+	 * 删除时间，如果存在表示已删除13位时间戳
+	 */
+	@TableLogic(value = "0",delval = "UNIX_TIMESTAMP(NOW()) * 1000")
+	private Long deleteTime;
+
+}

src/main/java/com/imed/costaccount/model/Hosptail.java → src/main/java/com/imed/costaccount/model/Hospital.java

@@ -23,8 +23,8 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName("sys_hosptail")
-public class Hosptail implements Serializable {
+@TableName("sys_hospital")
+public class Hospital implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
@@ -39,7 +39,7 @@ public class Hosptail implements Serializable {
 	/**
 	 * 账号
 	 */
-	private Integer isHosptail;
+	private Integer isHospital;
 	/**
 	 * 医院唯一标识
 	 */

src/main/java/com/imed/costaccount/model/dto/DepartmentDto.java

@@ -0,0 +1,23 @@
+package com.imed.costaccount.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.dto
+ * @date 2021-07-27 9:54
+ */
+@Data
+@ApiModel("科室信息dto参数")
+public class DepartmentDto {
+    @ApiModelProperty(name = "id",value = "科室的Id")
+    private Integer id;
+    @ApiModelProperty(name = "departmentName",value = "科室的名称")
+    private String departmentName;
+    @ApiModelProperty(name = "departmentCode",value = "科室的Id")
+    private String departmentCode;
+    @ApiModelProperty(name = "hospId",value = "医院的Id")
+    private Integer hospId;
+}

src/main/java/com/imed/costaccount/model/dto/DepartmentRequest.java

@@ -0,0 +1,29 @@
+package com.imed.costaccount.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NonNull;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.request
+ * @date 2021-07-27 10:07
+ */
+@Data
+@ApiModel("科室信息保存dto参数")
+public class DepartmentRequest {
+    @ApiModelProperty(name = "id",value = "科室的Id")
+    private Integer id;
+    @ApiModelProperty(name = "departmentName",value = "科室的名称")
+    @NotNull
+    private String departmentName;
+    @ApiModelProperty(name = "departmentCode",value = "科室的Id")
+    @NotNull
+    private String departmentCode;
+    @NotNull
+    @ApiModelProperty(name = "hospId",value = "医院的Id")
+    private Integer hospId;
+}

src/main/java/com/imed/costaccount/model/vo/DepartmentVO.java

@@ -0,0 +1,30 @@
+package com.imed.costaccount.model.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.vo
+ * @date 2021-07-27 9:25
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel
+public class DepartmentVO {
+    @ApiModelProperty(name = "id",value = "科室的Id")
+    private Integer id;
+    @ApiModelProperty(name = "departmentName",value = "科室的名称")
+    private String departmentName;
+    @ApiModelProperty(name = "departmentCode",value = "科室的Id")
+    private String departmentCode;
+    @ApiModelProperty(name = "hospId",value = "医院的Id")
+    private Integer hospId;
+    @ApiModelProperty(name = "createTime",value = "")
+    private Long createTime;
+}

src/main/java/com/imed/costaccount/service/DepartmentService.java

@@ -0,0 +1,48 @@
+package com.imed.costaccount.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.model.Department;
+import com.imed.costaccount.model.dto.DepartmentDto;
+import com.imed.costaccount.model.dto.DepartmentRequest;
+
+import java.util.List;
+
+/**
+ * 科室表
+ *
+ * @author KCYG
+ * @email KCYG@xinxicom
+ * @date 2021-07-27 08:49:37
+ */
+public interface DepartmentService extends IService<Department> {
+    /**
+     * 分页查询科室信息
+     * @param page
+     * @param pageSize
+     * @param hospId
+     * @param name
+     * @return
+     */
+    PageUtils queryList(Integer page, Integer pageSize,Integer hospId ,String name);
+
+    /**
+     * 根据指定条件查询科室的相关信息
+     * @param departmentDto
+     * @return
+     */
+    List<Department> getByDepartment(DepartmentDto departmentDto);
+
+    /**
+     * 保存科室信息
+     * @param departmentRequest
+     */
+    void addDepartment(DepartmentRequest departmentRequest);
+
+    /**
+     * 修改科室信息
+     * @param departmentRequest
+     */
+    void updateByDepartment(DepartmentRequest departmentRequest);
+}
+

src/main/java/com/imed/costaccount/service/HosptailService.java

@@ -2,12 +2,11 @@ package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
-import com.imed.costaccount.model.Hosptail;
+import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.dto.HosptailDto;
 import com.imed.costaccount.model.vo.CommonVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 医院表
@@ -16,7 +15,7 @@ import java.util.Map;
  * @email KCYG@xinxicom
  * @date 2021-07-26 08:52:56
  */
-public interface HosptailService extends IService<Hosptail> {
+public interface HosptailService extends IService<Hospital> {
 
     /**
      * 通过医院标识获取院区下拉列表
@@ -30,7 +29,7 @@ public interface HosptailService extends IService<Hosptail> {
      * @param hospSign
      * @return
      */
-    Hosptail getBySign(String hospSign);
+    Hospital getBySign(String hospSign);
 
     /**
      * 分页查询所有的医院信息
@@ -38,7 +37,7 @@ public interface HosptailService extends IService<Hosptail> {
      * @param pageSize
      * @return
      */
-    PageUtils queryList(Integer page, Integer pageSize,String name);
+    PageUtils queryList(Integer page, Integer pageSize,Integer hospId, String name);
 
     /**
      * 添加医院信息

src/main/java/com/imed/costaccount/service/impl/DepartmentServiceImpl.java

@@ -0,0 +1,97 @@
+package com.imed.costaccount.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.util.BeanUtil;
+import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.mapper.DepartmentMapper;
+import com.imed.costaccount.model.Department;
+import com.imed.costaccount.model.dto.DepartmentDto;
+import com.imed.costaccount.model.dto.DepartmentRequest;
+import com.imed.costaccount.model.vo.DepartmentVO;
+import com.imed.costaccount.service.DepartmentService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.StringUtils;
+
+@Service("departmentService")
+public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
+
+
+    /**
+     * 分页查询科室信息
+     *
+     * @param page
+     * @param pageSize
+     * @param hospId
+     * @param name
+     * @return
+     */
+    @Override
+    public PageUtils queryList(Integer page, Integer pageSize,Integer hospId, String name) {
+        Page<Department> departPage = new Page<>(page, pageSize);
+        Page<Department> pages = this.page(departPage, new QueryWrapper<Department>().lambda()
+                .eq(!StringUtils.isEmpty(hospId), Department::getHospId, hospId)
+                .like(!StringUtils.isEmpty(name), Department::getDepartmentName, name));
+        List<Department> records = pages.getRecords();
+        List<DepartmentVO> departmentVOList = BeanUtil.convertList(records, DepartmentVO.class);
+        PageUtils pageUtils = new PageUtils(pages);
+        pageUtils.setList(departmentVOList);
+        return pageUtils;
+    }
+
+    /**
+     * 根据指定条件查询科室的相关信息
+     *
+     * @param departmentDto
+     * @return
+     */
+    @Override
+    public List<Department> getByDepartment(DepartmentDto departmentDto) {
+        LambdaQueryWrapper<Department> wrapper = new QueryWrapper<Department>().lambda()
+                .eq(!StringUtils.isEmpty(departmentDto.getId()), Department::getId, departmentDto.getId())
+                .like(!StringUtils.isEmpty(departmentDto.getDepartmentName()), Department::getDepartmentName, departmentDto.getDepartmentName())
+                .eq(!StringUtils.isEmpty(departmentDto.getDepartmentCode()), Department::getDepartmentCode, departmentDto.getDepartmentCode())
+                .eq(!StringUtils.isEmpty(departmentDto.getHospId()), Department::getHospId, departmentDto.getHospId());
+        List<Department> departmentList = baseMapper.selectList(wrapper);
+        return departmentList;
+    }
+
+    /**
+     * 保存科室信息
+     *
+     * @param departmentRequest
+     */
+    @Override
+    public void addDepartment(DepartmentRequest departmentRequest) {
+        Department department = BeanUtil.convertObj(departmentRequest, Department.class);
+        department.setId(null);
+        department.setCreateTime(System.currentTimeMillis());
+        baseMapper.insert(department);
+    }
+
+    /**
+     * 修改科室信息
+     *
+     * @param departmentRequest
+     */
+    @Override
+    public void updateByDepartment(DepartmentRequest departmentRequest) {
+        Integer id = departmentRequest.getId();
+        Department department = baseMapper.selectById(id);
+        if (Objects.isNull(department)){
+            throw new CostException("未找到相关科室信息");
+        }
+        baseMapper.deleteById(id);
+        // 新增操作
+        department.setId(null);
+        department.setCreateTime(System.currentTimeMillis());
+        baseMapper.insert(department);
+    }
+}

src/main/java/com/imed/costaccount/service/impl/HosptailServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.HosptailMapper;
-import com.imed.costaccount.model.Hosptail;
+import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.dto.HosptailDto;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.HosptailVO;
@@ -24,7 +24,7 @@ import org.springframework.util.StringUtils;
 
 
 @Service("hosptailService")
-public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> implements HosptailService {
+public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hospital> implements HosptailService {
 
     /**
      * 分页查询所有的医院信息
@@ -34,11 +34,12 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
      * @return
      */
     @Override
-    public PageUtils queryList(Integer page, Integer pageSize,String name) {
-        Page<Hosptail> hosptailPage = new Page<>(page, pageSize);
-        Page<Hosptail> pages = this.page(hosptailPage,new QueryWrapper<Hosptail>()
-                .lambda().like(!StringUtils.isEmpty(name),Hosptail::getName,name));
-        List<Hosptail> records = pages.getRecords();
+    public PageUtils queryList(Integer page, Integer pageSize,Integer hospId ,String name) {
+        Page<Hospital> hosptailPage = new Page<>(page, pageSize);
+        Page<Hospital> pages = this.page(hosptailPage,new QueryWrapper<Hospital>()
+                .lambda().eq(!StringUtils.isEmpty(hospId),Hospital::getId,hospId)
+                .like(!StringUtils.isEmpty(name), Hospital::getName,name));
+        List<Hospital> records = pages.getRecords();
         List<HosptailVO> hosptailVOList = BeanUtil.convertList(records, HosptailVO.class);
         PageUtils pageUtils = new PageUtils(pages);
         pageUtils.setList(hosptailVOList);
@@ -54,9 +55,9 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
     public void saveHosptail(HosptailDto hosptailDto) {
         hosptailDto.setCreateTime(System.currentTimeMillis());
         // TODO 可能需要补充没有传递的数据
-        Hosptail hosptail = BeanUtil.convertObj(hosptailDto, Hosptail.class);
-        hosptail.setCreateTime(System.currentTimeMillis());
-        baseMapper.insert(hosptail);
+        Hospital hospital = BeanUtil.convertObj(hosptailDto, Hospital.class);
+        hospital.setCreateTime(System.currentTimeMillis());
+        baseMapper.insert(hospital);
     }
 
     /**
@@ -67,15 +68,15 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void updateByHosptail(HosptailDto hosptailDto) {
-        Hosptail hosptail = baseMapper.selectOne(new QueryWrapper<Hosptail>().lambda().
-                eq(!StringUtils.isEmpty(hosptailDto.getId()), Hosptail::getId, hosptailDto.getId()));
-        if (Objects.isNull(hosptail)) {
+        Hospital hospital = baseMapper.selectOne(new QueryWrapper<Hospital>().lambda().
+                eq(!StringUtils.isEmpty(hosptailDto.getId()), Hospital::getId, hosptailDto.getId()));
+        if (Objects.isNull(hospital)) {
             throw new CostException("不存在相关医院信息");
         }
-        baseMapper.deleteById(hosptail.getId());
-        Hosptail hosptailRequest = BeanUtil.convertObj(hosptail, Hosptail.class);
-        hosptailRequest.setId(null);
-        baseMapper.insert(hosptailRequest);
+        baseMapper.deleteById(hospital.getId());
+        Hospital hospitalRequest = BeanUtil.convertObj(hospital, Hospital.class);
+        hospitalRequest.setId(null);
+        baseMapper.insert(hospitalRequest);
     }
 
 
@@ -86,13 +87,13 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
      */
     @Override
     public List<CommonVO> getHospArea(String sign) {
-        Hosptail one = this.getBySign(sign);
+        Hospital one = this.getBySign(sign);
         // 获取下面所有院区
-        List<Hosptail> list = this.list(
-                new LambdaQueryWrapper<Hosptail>()
-                        .select(Hosptail::getId)
-                        .eq(Hosptail::getIsHosptail, 1)
-                        .eq(Hosptail::getParentId, one.getId())
+        List<Hospital> list = this.list(
+                new LambdaQueryWrapper<Hospital>()
+                        .select(Hospital::getId)
+                        .eq(Hospital::getIsHospital, 1)
+                        .eq(Hospital::getParentId, one.getId())
         );
         // 如果不存在院区
         if (CollUtil.isEmpty(list)) {
@@ -107,12 +108,12 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
      * @return
      */
     @Override
-    public Hosptail getBySign(String hospSign) {
-        Hosptail one = this.getOne(
-                new LambdaQueryWrapper<Hosptail>()
-                        .select(Hosptail::getId,Hosptail::getName)
-                        .eq(Hosptail::getIsHosptail, 0)
-                        .eq(Hosptail::getSign, hospSign)
+    public Hospital getBySign(String hospSign) {
+        Hospital one = this.getOne(
+                new LambdaQueryWrapper<Hospital>()
+                        .select(Hospital::getId, Hospital::getName)
+                        .eq(Hospital::getIsHospital, 0)
+                        .eq(Hospital::getSign, hospSign)
                         .last("limit 1")
         );
         if (Objects.isNull(one)) {

src/main/java/com/imed/costaccount/service/impl/UserServiceImpl.java

@@ -13,7 +13,7 @@ import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.mapper.UserMapper;
-import com.imed.costaccount.model.Hosptail;
+import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.LoginDTO;
 import com.imed.costaccount.model.dto.UserDto;
@@ -22,13 +22,10 @@ import com.imed.costaccount.model.vo.UserVO;
 import com.imed.costaccount.service.HosptailService;
 import com.imed.costaccount.service.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
@@ -66,8 +63,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         String hospSign = loginDTO.getHospSign();
         Integer id = loginDTO.getId();
         if (Objects.isNull(id)) {
-            Hosptail hosptail = hosptailService.getBySign(hospSign);
-            id = hosptail.getId();
+            Hospital hospital = hosptailService.getBySign(hospSign);
+            id = hospital.getId();
         }
         // 院区情况
         User one = this.getOne(
@@ -114,7 +111,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      */
     @Override
     public List<UserVO> getByUserName(String name) {
-        QueryWrapper<User> wrapper = new QueryWrapper<>();
         List<User> users = baseMapper.selectList(new QueryWrapper<User>().lambda().like(!StringUtils.isEmpty(name),User::getName,name));
         List<UserVO> userVOS = BeanUtil.convertList(users, UserVO.class);
         return userVOS;
@@ -128,11 +124,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void saveUser(UserDto userDto) {
-//        User user = (User) SecurityUtils.getSubject().getPrincipal();
-//        // 医院的Id
-//        Integer hospId = user.getHospId();
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        // 医院的Id
+        Integer hospId = user.getHospId();
 
-        Integer hospId=1;
         User userRequest = BeanUtil.convertObj(userDto, User.class);
         if (StringUtils.isEmpty(userDto.getPassword())){
             throw new CostException("密码不能为空");
@@ -188,9 +183,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             List<Object> data = list.get(i);
             log.info("得到用户输入的数据为：{}",data);
             User user = new User();
-            // TODO: 2021/7/26 暂时写死
-//            user.setHospId(currentUser.getHospId());
-            user.setHospId(1);
+            user.setHospId(currentUser.getHospId());
             user.setCreateTime(new Date().getTime());
             int size = data.size();
             if (size != 3) {

src/main/java/com/imed/costaccount/web/DepartmentController.java

@@ -0,0 +1,92 @@
+package com.imed.costaccount.web;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.common.util.Result;
+import com.imed.costaccount.model.Department;
+import com.imed.costaccount.model.User;
+import com.imed.costaccount.model.dto.DepartmentDto;
+import com.imed.costaccount.model.dto.DepartmentRequest;
+import com.imed.costaccount.service.DepartmentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+
+/**
+ * 科室表
+ *
+ * @author KCYG
+ * @date 2021-07-27 08:49:37
+ */
+@RestController
+@RequestMapping("/department")
+@Api(tags = "科室信息管理")
+
+public class DepartmentController {
+    @Autowired
+    private DepartmentService departmentService;
+
+    /**
+     * 列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("分页查询科室信息")
+    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                       @RequestParam(value = "name",required = false) String name){
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        Integer hospId = user.getHospId();
+        PageUtils pageUtils= departmentService.queryList(page,pageSize,hospId,name);
+        return Result.ok(pageUtils);
+    }
+
+
+    /**
+     * 信息
+     */
+    @GetMapping("/getDepartment")
+    @ApiOperation("根据指定条件查询科室的相关信息")
+    public Result getDepartmentId(@RequestBody DepartmentDto departmentDto){
+		List<Department> departmentList = departmentService.getByDepartment(departmentDto);
+        return Result.ok(departmentList);
+    }
+
+    /**
+     * 保存
+     */
+    @PostMapping("/save")
+    @ApiOperation("保存科室相关信息")
+    public Result save(@RequestBody @Valid DepartmentRequest departmentRequest){
+		departmentService.addDepartment(departmentRequest);
+        return Result.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping("/update")
+    @ApiOperation("修改科室信息")
+    public Result update(@RequestBody DepartmentRequest departmentRequest){
+		departmentService.updateByDepartment(departmentRequest);
+        return Result.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/delete")
+    @ApiOperation("删除科室信息")
+    public Result delete(@RequestBody Integer[] ids){
+		departmentService.removeByIds(Arrays.asList(ids));
+        return Result.ok();
+    }
+
+}

src/main/java/com/imed/costaccount/web/HosptailController.java

@@ -1,15 +1,14 @@
 package com.imed.costaccount.web;
 
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
-import com.imed.costaccount.model.Hosptail;
+import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.HosptailDto;
 import com.imed.costaccount.service.HosptailService;
+import com.sun.xml.internal.bind.v2.TODO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
@@ -48,26 +47,26 @@ public class HosptailController {
     public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
-//       TODO  User user = (User) SecurityUtils.getSubject().getPrincipal();  没有token
-
-        PageUtils pageUtils = hosptailService.queryList(page,pageSize,name);
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        Integer hospId = user.getHospId();
+        PageUtils pageUtils = hosptailService.queryList(page,pageSize,hospId,name);
         return Result.ok(pageUtils);
     }
 
     /**
      * 信息
      */
-    @RequestMapping("/getById")
+    @GetMapping("/getById")
     @ApiOperation("根据Id查询医院信息")
     public Result info(Integer id){
-		Hosptail hosptail = hosptailService.getById(id);
-        return Result.ok(hosptail);
+		Hospital hospital = hosptailService.getById(id);
+        return Result.ok(hospital);
     }
 
     /**
      * 保存
      */
-    @RequestMapping("/save")
+    @PostMapping("/save")
     @ApiOperation("保存医院信息")
     public Result save(@RequestBody HosptailDto hosptailDto){
 		hosptailService.saveHosptail(hosptailDto);
@@ -78,7 +77,7 @@ public class HosptailController {
      * 修改
      * 修改的操作是作废新增
      */
-    @RequestMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("修改医院信息")
     public Result update(@RequestBody HosptailDto hosptailDto){
         // 作废操作
@@ -89,7 +88,7 @@ public class HosptailController {
     /**
      * 删除
      */
-    @RequestMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation("删除医院信息")
     public Result delete(@RequestBody Integer[] ids){
 		hosptailService.removeByIds(Arrays.asList(ids));

src/main/resources/mapper/DepartmentMapper.xml

@@ -0,0 +1,17 @@
+<?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.imed.costaccount.mapper.DepartmentMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.imed.costaccount.model.Department" id="departmentMap">
+        <result property="id" column="id"/>
+        <result property="departmentName" column="department_name"/>
+        <result property="departmentCode" column="department_code"/>
+        <result property="hospId" column="hosp_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="deleteTime" column="delete_time"/>
+    </resultMap>
+
+
+</mapper>

src/main/resources/mapper/HosptailMapper.xml

@@ -0,0 +1,19 @@
+<?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.imed.costaccount.mapper.HosptailMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.imed.costaccount.model.Hospital" id="hosptailMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="isHospital" column="is_hosptail"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="parentName" column="parent_name"/>
+        <result property="sign" column="sign"/>
+        <result property="createTime" column="create_time"/>
+        <result property="deleteTime" column="delete_time"/>
+    </resultMap>
+
+
+</mapper>

src/main/resources/mapper/UserMapper.xml

@@ -10,6 +10,7 @@
         <result property="account" column="account"/>
         <result property="password" column="password"/>
         <result property="hospId" column="hosp_id"/>
+        <result property="hospitalStatus" column="hospital" />
         <result property="createTime" column="create_time"/>
         <result property="deleteTime" column="delete_time"/>
     </resultMap>