修改Hospital命名

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

@@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-07-26 08:52:56
  */
 @Mapper
-public interface HosptailMapper extends BaseMapper<Hospital> {
+public interface HospitalMapper extends BaseMapper<Hospital> {
 	
 }

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

@@ -3,7 +3,6 @@ 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;
 
@@ -13,17 +12,17 @@ import javax.validation.constraints.NotNull;
  * @date 2021-07-27 10:07
  */
 @Data
-@ApiModel("科室信息保存dto参数")
+@ApiModel("科室信息保存request参数")
 public class DepartmentRequest {
     @ApiModelProperty(name = "id",value = "科室的Id")
     private Integer id;
     @ApiModelProperty(name = "departmentName",value = "科室的名称")
-    @NotNull
+    @NotNull(message = "科室名称不能为空")
     private String departmentName;
     @ApiModelProperty(name = "departmentCode",value = "科室的Id")
-    @NotNull
+    @NotNull(message = "科室Id不能为空")
     private String departmentCode;
-    @NotNull
     @ApiModelProperty(name = "hospId",value = "医院的Id")
+    @NotNull(message = "医院Id不能为空")
     private Integer hospId;
 }

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

@@ -30,7 +30,7 @@ public class HosptailDto {
      * 账号
      */
     @ApiModelProperty(name = "is_hosptail",value = "是否为院区（0.不是，1.是）默认为0")
-    private Integer isHosptail;
+    private Integer isHospital;
     /**
      * 医院唯一标识
      */

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * @author 李加喜
@@ -33,5 +33,6 @@ public class UserDto {
     private Integer hospId;
 
     @ApiModelProperty(name = "hospitalStatus", value = "在院状态")
+    @NotNull(message = "在院状态不能为空")
     private Integer hospitalStatus;
 }

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

@@ -28,10 +28,13 @@ public interface DepartmentService extends IService<Department> {
 
     /**
      * 根据指定条件查询科室的相关信息
-     * @param departmentDto
+     * @param id
+     * @param departmentName
+     * @param departmentCode
+     * @param hospId
      * @return
      */
-    List<Department> getByDepartment(DepartmentDto departmentDto);
+    List<Department> getByDepartment(Integer id,String departmentName,String departmentCode,Integer hospId);
 
     /**
      * 保存科室信息

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

@@ -48,17 +48,19 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     /**
      * 根据指定条件查询科室的相关信息
-     *
-     * @param departmentDto
+     * @param id
+     * @param departmentName
+     * @param departmentCode
+     * @param hospId
      * @return
      */
     @Override
-    public List<Department> getByDepartment(DepartmentDto departmentDto) {
+    public List<Department> getByDepartment(Integer id,String departmentName,String departmentCode,Integer hospId) {
         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());
+                .eq(!StringUtils.isEmpty(id), Department::getId, id)
+                .like(!StringUtils.isEmpty(departmentName), Department::getDepartmentName, departmentName)
+                .eq(!StringUtils.isEmpty(departmentCode), Department::getDepartmentCode, departmentCode)
+                .eq(!StringUtils.isEmpty(hospId), Department::getHospId, hospId);
         List<Department> departmentList = baseMapper.selectList(wrapper);
         return departmentList;
     }

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

@@ -5,7 +5,7 @@ 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.PageUtils;
-import com.imed.costaccount.mapper.HosptailMapper;
+import com.imed.costaccount.mapper.HospitalMapper;
 import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.dto.HosptailDto;
 import com.imed.costaccount.model.vo.CommonVO;
@@ -24,7 +24,7 @@ import org.springframework.util.StringUtils;
 
 
 @Service("hosptailService")
-public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hospital> implements HosptailService {
+public class HosptailServiceImpl extends ServiceImpl<HospitalMapper, Hospital> implements HosptailService {
 
     /**
      * 分页查询所有的医院信息

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

@@ -54,8 +54,11 @@ public class DepartmentController {
      */
     @GetMapping("/getDepartment")
     @ApiOperation("根据指定条件查询科室的相关信息")
-    public Result getDepartmentId(@RequestBody DepartmentDto departmentDto){
-		List<Department> departmentList = departmentService.getByDepartment(departmentDto);
+    public Result getDepartmentId(@RequestParam(name = "id",required = false) Integer id,
+                                  @RequestParam(name = "departmentName",required = false) String departmentName,
+                                  @RequestParam(name = "departmentCode",required = false) String departmentCode,
+                                  @RequestParam(name = "hospId",required = false) Integer hospId){
+		List<Department> departmentList = departmentService.getByDepartment(id,departmentName,departmentCode,hospId);
         return Result.ok(departmentList);
     }
 

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

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/costAccount/hosptail")
 @Api(tags = "医院相关操作")
-public class HosptailController {
+public class HospitalController {
     @Autowired
     private HosptailService hosptailService;
 

src/main/resources/mapper/HosptailMapper.xml → src/main/resources/mapper/HospitalMapper.xml

@@ -1,13 +1,13 @@
 <?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">
+<mapper namespace="com.imed.costaccount.mapper.HospitalMapper">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <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="isHospital" column="is_hospital"/>
         <result property="parentId" column="parent_id"/>
         <result property="parentName" column="parent_name"/>
         <result property="sign" column="sign"/>