医院以及科室代码更新

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/HospitalController.java

@@ -25,8 +25,11 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.info.hospital.domain.bo.HospitalBo;
+import com.ruoyi.info.hospital.domain.bo.HospitalRackUpdateBo;
+import com.ruoyi.info.hospital.domain.vo.HospitalSimpleInfoVo;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.hospital.service.IHospitalService;
 
@@ -111,15 +114,30 @@ public class HospitalController extends BaseController {
     }
 
     /**
-     * 导出医院信息列表
+     * 修改医院上下架
      */
-    @ApiOperation("导出医院信息列表")
-    @SaCheckPermission("info:hospital:export")
-    @Log(title = "医院信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(@Validated HospitalBo bo, HttpServletResponse response) {
-        List<HospitalVo> list = iHospitalService.queryList(bo);
-        ExcelUtil.exportExcel(list, "医院信息", HospitalVo.class, response);
+    @ApiOperation("修改医院上下架状态")
+    @SaCheckPermission("info:hospital:edit")
+    @Log(title = "修改医院上下架状态", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateRackStatus")
+    public R<Void> updateRackStatus(@Validated @RequestBody HospitalRackUpdateBo bo) {
+        //  修改医院上下架
+        iHospitalService.updateRackStatus(bo);
+        return R.ok();
+    }
+
+    /**
+     * 获取所有医院列表
+     */
+    @ApiOperation("查询医院信息列表")
+    @GetMapping("/simpleList")
+    public R<List<HospitalSimpleInfoVo>> simpleList() {
+        List<HospitalVo> hospitalVoList = iHospitalService.queryList(new HospitalBo());
+        return R.ok(BeanCopyUtils.copyList(hospitalVoList, HospitalSimpleInfoVo.class));
     }
 
+
+
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/HospitalDepartmentController.java

@@ -1,32 +1,39 @@
 package com.ruoyi.web.controller.info;
 
-import java.util.List;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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 com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.info.hospital.domain.vo.HospitalDepartmentVo;
 import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentBo;
+import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentRackUpdateBo;
+import com.ruoyi.info.hospital.domain.bo.HospitalRackUpdateBo;
+import com.ruoyi.info.hospital.domain.vo.HospitalDepartmentVo;
 import com.ruoyi.info.hospital.service.IHospitalDepartmentService;
-import com.ruoyi.common.core.page.TableDataInfo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 
 /**
  * 医院科室信息Controller
@@ -102,16 +109,18 @@ public class HospitalDepartmentController extends BaseController {
         return toAjax(iHospitalDepartmentService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 
+
     /**
-     * 导出医院科室信息列表
+     * 修改医院科室上下架状态
      */
-    @ApiOperation("导出医院科室信息列表")
-    @SaCheckPermission("info:hospitalDepartment:export")
-    @Log(title = "医院科室信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(@Validated HospitalDepartmentBo bo, HttpServletResponse response) {
-        List<HospitalDepartmentVo> list = iHospitalDepartmentService.queryList(bo);
-        ExcelUtil.exportExcel(list, "医院科室信息", HospitalDepartmentVo.class, response);
+    @ApiOperation("修改医院科室上下架状态")
+    @SaCheckPermission("info:hospitalDepartment:edit")
+    @Log(title = "修改医院科室上下架状态", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateRackStatus")
+    public R<Void> updateRackStatus(@Validated @RequestBody HospitalDepartmentRackUpdateBo bo) {
+        //  修改医院科室上下架
+        iHospitalDepartmentService.updateRackStatus(bo);
+        return R.ok();
     }
 
 }

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiHospitalController.java

@@ -0,0 +1,22 @@
+package com.ruoyi.api.controller.info;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * @author fucheng.bai
+ * @date 2025/9/22
+ */
+@Validated
+@Api(value = "API 医院管理控制器", tags = {"医院管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/info/hospital")
+public class ApiHospitalController {
+
+
+}

ruoyi-info/pom.xml

@@ -27,6 +27,11 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-base</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/Hospital.java

@@ -61,7 +61,7 @@ public class Hospital extends BaseEntity {
     /**
      * 省id
      */
-    private Integer provinceId;
+    private String provinceId;
     /**
      * 省名称
      */
@@ -69,7 +69,7 @@ public class Hospital extends BaseEntity {
     /**
      * 市id
      */
-    private Integer cityId;
+    private String cityId;
     /**
      * 市名称
      */
@@ -77,7 +77,7 @@ public class Hospital extends BaseEntity {
     /**
      * 区域id
      */
-    private Integer areaId;
+    private String areaId;
     /**
      * 区域名称
      */

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalBo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.info.hospital.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
@@ -10,6 +11,8 @@ import javax.validation.constraints.*;
 
 import java.util.Date;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
@@ -69,7 +72,6 @@ public class HospitalBo extends BaseEntity {
      * 上架状态 0-上架 1-下架
      */
     @ApiModelProperty(value = "上架状态 0-上架 1-下架", required = true)
-    @NotBlank(message = "上架状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String rackStatus;
 
     /**
@@ -91,13 +93,12 @@ public class HospitalBo extends BaseEntity {
      */
     @ApiModelProperty(value = "省id", required = true)
     @NotNull(message = "省id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer provinceId;
+    private String provinceId;
 
     /**
      * 省名称
      */
     @ApiModelProperty(value = "省名称", required = true)
-    @NotBlank(message = "省名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String provinceName;
 
     /**
@@ -105,13 +106,12 @@ public class HospitalBo extends BaseEntity {
      */
     @ApiModelProperty(value = "市id", required = true)
     @NotNull(message = "市id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer cityId;
+    private String cityId;
 
     /**
      * 市名称
      */
     @ApiModelProperty(value = "市名称", required = true)
-    @NotBlank(message = "市名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cityName;
 
     /**
@@ -119,13 +119,12 @@ public class HospitalBo extends BaseEntity {
      */
     @ApiModelProperty(value = "区域id", required = true)
     @NotNull(message = "区域id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer areaId;
+    private String areaId;
 
     /**
      * 区域名称
      */
     @ApiModelProperty(value = "区域名称", required = true)
-    @NotBlank(message = "区域名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaName;
 
     /**
@@ -174,5 +173,21 @@ public class HospitalBo extends BaseEntity {
     @NotNull(message = "排序序号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer sortOrder;
 
+    /**
+     * 创建时间开始
+     */
+    @ApiModelProperty(value = "创建时间开始")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束
+     */
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间结束")
+    private Date createTimeEnd;
+
 
 }

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalDepartmentBo.java

@@ -1,5 +1,8 @@
 package com.ruoyi.info.hospital.domain.bo;
 
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
@@ -8,7 +11,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.QueryGroup;
 
 /**
  * 医院科室信息业务对象 tb_hospital_department
@@ -32,7 +38,7 @@ public class HospitalDepartmentBo extends BaseEntity {
      * 医院id
      */
     @ApiModelProperty(value = "医院id", required = true)
-    @NotBlank(message = "医院id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "医院id不能为空", groups = { AddGroup.class, EditGroup.class, QueryGroup.class })
     private String hospitalId;
 
     /**
@@ -50,11 +56,21 @@ public class HospitalDepartmentBo extends BaseEntity {
     private String rackStatus;
 
     /**
-     * 排序序号
+     * 创建时间开始
+     */
+    @ApiModelProperty(value = "创建时间开始")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束
      */
-    @ApiModelProperty(value = "排序序号", required = true)
-    @NotNull(message = "排序序号不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer sortOrder;
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间结束")
+    private Date createTimeEnd;
+
 
 
 }

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalDepartmentRackUpdateBo.java

@@ -0,0 +1,31 @@
+package com.ruoyi.info.hospital.domain.bo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fucheng.bai
+ * @date 2025/9/22
+ */
+@Data
+@ApiModel("医院科室信息业务对象")
+public class HospitalDepartmentRackUpdateBo {
+
+    /**
+     * 医院ID
+     */
+    @ApiModelProperty(value = "医院ID", required = true)
+    @NotNull(message = "医院ID不能为空")
+    private Long id;
+
+    /**
+     * 上架状态 0-上架 1-下架
+     */
+    @ApiModelProperty(value = "上架状态 0-上架 1-下架", required = true)
+    @NotBlank(message = "上架状态不能为空")
+    private String rackStatus;
+}

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalRackUpdateBo.java

@@ -0,0 +1,32 @@
+package com.ruoyi.info.hospital.domain.bo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fucheng.bai
+ * @date 2025/9/22
+ */
+@Data
+@ApiModel("修改上下架状态对象")
+public class HospitalRackUpdateBo {
+
+
+    /**
+     * 医院ID
+     */
+    @ApiModelProperty(value = "医院ID", required = true)
+    @NotNull(message = "医院ID不能为空")
+    private Long id;
+
+    /**
+     * 上架状态 0-上架 1-下架
+     */
+    @ApiModelProperty(value = "上架状态 0-上架 1-下架", required = true)
+    @NotBlank(message = "上架状态不能为空")
+    private String rackStatus;
+}

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/vo/HospitalSimpleInfoVo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.info.hospital.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fucheng.bai
+ * @date 2025/9/22
+ */
+@Data
+@ApiModel("医院简略信息")
+public class HospitalSimpleInfoVo {
+
+    /**
+     * 医院id
+     */
+    @ApiModelProperty("医院ID")
+    private Long id;
+
+    /**
+     * 医院名称
+     */
+    @ApiModelProperty("医院名称")
+    private String name;
+}

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/vo/HospitalVo.java

@@ -91,7 +91,7 @@ public class HospitalVo {
      */
     @ExcelProperty(value = "省id")
     @ApiModelProperty("省id")
-    private Integer provinceId;
+    private String provinceId;
 
     /**
      * 省名称
@@ -105,7 +105,7 @@ public class HospitalVo {
      */
     @ExcelProperty(value = "市id")
     @ApiModelProperty("市id")
-    private Integer cityId;
+    private String cityId;
 
     /**
      * 市名称
@@ -119,7 +119,7 @@ public class HospitalVo {
      */
     @ExcelProperty(value = "区域id")
     @ApiModelProperty("区域id")
-    private Integer areaId;
+    private String areaId;
 
     /**
      * 区域名称

ruoyi-info/src/main/java/com/ruoyi/info/hospital/exception/HospitalDepartmentExceptionEnum.java

@@ -10,8 +10,11 @@ import java.util.Objects;
 public enum HospitalDepartmentExceptionEnum implements IIntegerEnum {
 
     // TODO 注意检查错误码，保证系统内唯一
-    HospitalDepartment_IS_NOT_EXISTS(200001, "医院科室信息不存在"),
+    HOSPITAL_DEPARTMENT_IS_NOT_EXISTS(200001, "医院科室信息不存在"),
 
+    HOSPITAL_DEPARTMENT_NAME_ALREADY_EXISTS(200002, "该医院下科室名称已经存在"),
+
+    HOSPITAL_ID_CANNOT_CHANGE(200003, "科室的医院不可变更"),
     ;
 
     private Integer code;

ruoyi-info/src/main/java/com/ruoyi/info/hospital/exception/HospitalExceptionEnum.java

@@ -10,10 +10,11 @@ import java.util.Objects;
 public enum HospitalExceptionEnum implements IIntegerEnum {
 
     // TODO 注意检查错误码，保证系统内唯一
-    Hospital_IS_NOT_EXISTS(200001, "医院信息不存在"),
+    HOSPITAL_IS_NOT_EXISTS(200001, "医院信息不存在"),
 
-    ;
+    HOSPITAL_NAME_ALREADY_EXISTS(200002, "医院名称已经存在"),
 
+    ;
     private Integer code;
 
     private String msg;

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/IHospitalDepartmentService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.info.hospital.service;
 
 import com.ruoyi.info.hospital.domain.HospitalDepartment;
+import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentRackUpdateBo;
+import com.ruoyi.info.hospital.domain.bo.HospitalRackUpdateBo;
 import com.ruoyi.info.hospital.domain.vo.HospitalDepartmentVo;
 import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -74,4 +76,10 @@ public interface IHospitalDepartmentService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
+    /**
+     * 修改科室上下架状态
+     *
+     * @param bo
+     */
+    void updateRackStatus(HospitalDepartmentRackUpdateBo bo);
 }

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/IHospitalService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.info.hospital.service;
 
 import com.ruoyi.info.hospital.domain.Hospital;
+import com.ruoyi.info.hospital.domain.bo.HospitalRackUpdateBo;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.hospital.domain.bo.HospitalBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -74,4 +75,10 @@ public interface IHospitalService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
+    /**
+     * 修改医院上下架状态
+     *
+     * @param bo
+     */
+    void updateRackStatus(HospitalRackUpdateBo bo);
 }

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/impl/HospitalDepartmentServiceImpl.java

@@ -1,27 +1,32 @@
 package com.ruoyi.info.hospital.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import com.ruoyi.info.hospital.domain.HospitalDepartment;
 import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentBo;
+import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentRackUpdateBo;
 import com.ruoyi.info.hospital.domain.vo.HospitalDepartmentVo;
-import com.ruoyi.info.hospital.domain.HospitalDepartment;
+import com.ruoyi.info.hospital.exception.HospitalDepartmentExceptionEnum;
+import com.ruoyi.info.hospital.exception.HospitalExceptionEnum;
 import com.ruoyi.info.hospital.mapper.HospitalDepartmentMapper;
 import com.ruoyi.info.hospital.service.IHospitalDepartmentService;
-import com.ruoyi.info.hospital.exception.HospitalDepartmentExceptionEnum;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
 
 /**
  * 医院科室信息Service业务层处理
@@ -65,8 +70,10 @@ public class HospitalDepartmentServiceImpl implements IHospitalDepartmentService
         LambdaQueryWrapper<HospitalDepartment> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getHospitalId()), HospitalDepartment::getHospitalId, bo.getHospitalId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), HospitalDepartment::getName, bo.getName());
+        lqw.ge(ObjectUtil.isNotNull(bo.getCreateTimeStart()), HospitalDepartment::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(ObjectUtil.isNotNull(bo.getCreateTimeEnd()), HospitalDepartment::getCreateTime, bo.getCreateTimeEnd());
         lqw.eq(StringUtils.isNotBlank(bo.getRackStatus()), HospitalDepartment::getRackStatus, bo.getRackStatus());
-        lqw.eq(bo.getSortOrder() != null, HospitalDepartment::getSortOrder, bo.getSortOrder());
+        lqw.orderByDesc(HospitalDepartment::getSortOrder).orderByDesc(HospitalDepartment::getId);
         return lqw;
     }
 
@@ -91,7 +98,7 @@ public class HospitalDepartmentServiceImpl implements IHospitalDepartmentService
     public HospitalDepartment loadById(Long id, Boolean tw){
         HospitalDepartment info = this.baseMapper.selectById(id);
         if(ObjectUtil.isEmpty(info) && tw){
-            throw new ServiceException(HospitalDepartmentExceptionEnum.HospitalDepartment_IS_NOT_EXISTS);
+            throw new ServiceException(HospitalDepartmentExceptionEnum.HOSPITAL_DEPARTMENT_IS_NOT_EXISTS);
         }
         return info;
     }
@@ -122,6 +129,10 @@ public class HospitalDepartmentServiceImpl implements IHospitalDepartmentService
     @Override
     public Boolean updateByBo(HospitalDepartmentBo bo) {
         HospitalDepartment hospitalDepartment = baseMapper.selectById(bo.getId());
+        // TODO 医院id不可变更
+        if (!ObjectUtil.equals(bo.getHospitalId(), hospitalDepartment.getHospitalId())) {
+            throw new ServiceException(HospitalDepartmentExceptionEnum.HOSPITAL_ID_CANNOT_CHANGE);
+        }
         HospitalDepartment update = BeanCopyUtils.copy(bo, hospitalDepartment);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
@@ -133,7 +144,24 @@ public class HospitalDepartmentServiceImpl implements IHospitalDepartmentService
      * @param entity 实体类数据
      */
     private void validEntityBeforeSave(HospitalDepartment entity){
-        //TODO 做一些数据校验,如唯一约束
+        // 医院名称不可重复
+        LambdaQueryWrapper<HospitalDepartment> lqw = new LambdaQueryWrapper<HospitalDepartment>()
+            .eq(HospitalDepartment::getName, entity.getName())
+            .eq(HospitalDepartment::getId, entity.getHospitalId());
+
+        List<HospitalDepartment> hospitalList = baseMapper.selectList(lqw);
+        if (CollUtil.isNotEmpty(hospitalList)) {
+            if (entity.getId() == null) {
+                // 新增校验
+                throw new ServiceException(HospitalDepartmentExceptionEnum.HOSPITAL_DEPARTMENT_NAME_ALREADY_EXISTS);
+            } else {
+                // 编辑校验
+                if (hospitalList.stream().anyMatch(hospital -> !hospital.getId().equals(entity.getId()))) {
+                    throw new ServiceException(HospitalDepartmentExceptionEnum.HOSPITAL_DEPARTMENT_NAME_ALREADY_EXISTS);
+                }
+            }
+
+        }
     }
 
     /**
@@ -150,4 +178,23 @@ public class HospitalDepartmentServiceImpl implements IHospitalDepartmentService
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 
+    /**
+     * 修改科室上下架状态
+     *
+     * @param bo
+     */
+    @Override
+    public void updateRackStatus(HospitalDepartmentRackUpdateBo bo) {
+        HospitalDepartment hospitalDepartment = baseMapper.selectById(bo.getId());
+        if (hospitalDepartment == null) {
+            throw new ServiceException(HospitalExceptionEnum.HOSPITAL_IS_NOT_EXISTS);
+        }
+
+        if (hospitalDepartment.getRackStatus().equals(bo.getRackStatus())) {
+            return;
+        }
+        hospitalDepartment.setRackStatus(bo.getRackStatus());
+        baseMapper.updateById(hospitalDepartment);
+    }
+
 }

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/impl/HospitalServiceImpl.java

@@ -1,27 +1,32 @@
 package com.ruoyi.info.hospital.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.base.area.service.ISysCnAreaService;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import com.ruoyi.info.hospital.domain.Hospital;
 import com.ruoyi.info.hospital.domain.bo.HospitalBo;
+import com.ruoyi.info.hospital.domain.bo.HospitalRackUpdateBo;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
-import com.ruoyi.info.hospital.domain.Hospital;
 import com.ruoyi.info.hospital.exception.HospitalExceptionEnum;
 import com.ruoyi.info.hospital.mapper.HospitalMapper;
 import com.ruoyi.info.hospital.service.IHospitalService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
 
 /**
  * 医院信息Service业务层处理
@@ -35,6 +40,9 @@ public class HospitalServiceImpl implements IHospitalService {
 
     private final HospitalMapper baseMapper;
 
+    private final ISysCnAreaService sysCnAreaService;
+
+
     /**
      * 查询医院信息分页
      *
@@ -65,25 +73,15 @@ public class HospitalServiceImpl implements IHospitalService {
         LambdaQueryWrapper<Hospital> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), Hospital::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getResponsiblePerson()), Hospital::getResponsiblePerson, bo.getResponsiblePerson());
-        lqw.eq(StringUtils.isNotBlank(bo.getContactMobile()), Hospital::getContactMobile, bo.getContactMobile());
-        lqw.eq(StringUtils.isNotBlank(bo.getAddress()), Hospital::getAddress, bo.getAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getBusinessStatus()), Hospital::getBusinessStatus, bo.getBusinessStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getRackStatus()), Hospital::getRackStatus, bo.getRackStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getLevel()), Hospital::getLevel, bo.getLevel());
-        lqw.eq(StringUtils.isNotBlank(bo.getLabel()), Hospital::getLabel, bo.getLabel());
         lqw.eq(bo.getProvinceId() != null, Hospital::getProvinceId, bo.getProvinceId());
-        lqw.like(StringUtils.isNotBlank(bo.getProvinceName()), Hospital::getProvinceName, bo.getProvinceName());
         lqw.eq(bo.getCityId() != null, Hospital::getCityId, bo.getCityId());
-        lqw.like(StringUtils.isNotBlank(bo.getCityName()), Hospital::getCityName, bo.getCityName());
         lqw.eq(bo.getAreaId() != null, Hospital::getAreaId, bo.getAreaId());
-        lqw.like(StringUtils.isNotBlank(bo.getAreaName()), Hospital::getAreaName, bo.getAreaName());
-        lqw.eq(StringUtils.isNotBlank(bo.getCoordinates()), Hospital::getCoordinates, bo.getCoordinates());
-        lqw.eq(StringUtils.isNotBlank(bo.getServiceMobile()), Hospital::getServiceMobile, bo.getServiceMobile());
-        lqw.eq(StringUtils.isNotBlank(bo.getIntroduction()), Hospital::getIntroduction, bo.getIntroduction());
-        lqw.eq(StringUtils.isNotBlank(bo.getLogoUrl()), Hospital::getLogoUrl, bo.getLogoUrl());
-        lqw.eq(StringUtils.isNotBlank(bo.getQrCodeUrl()), Hospital::getQrCodeUrl, bo.getQrCodeUrl());
-        lqw.eq(StringUtils.isNotBlank(bo.getBusinessHours()), Hospital::getBusinessHours, bo.getBusinessHours());
-        lqw.eq(bo.getSortOrder() != null, Hospital::getSortOrder, bo.getSortOrder());
+        lqw.ge(ObjectUtil.isNotNull(bo.getCreateTimeStart()), Hospital::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(ObjectUtil.isNotNull(bo.getCreateTimeEnd()), Hospital::getCreateTime, bo.getCreateTimeEnd());
+        lqw.orderByDesc(Hospital::getSortOrder).orderByDesc(Hospital::getId);
         return lqw;
     }
 
@@ -108,7 +106,7 @@ public class HospitalServiceImpl implements IHospitalService {
     public Hospital loadById(Long id, Boolean tw){
         Hospital info = this.baseMapper.selectById(id);
         if(ObjectUtil.isEmpty(info) && tw){
-            throw new ServiceException(HospitalExceptionEnum.Hospital_IS_NOT_EXISTS);
+            throw new ServiceException(HospitalExceptionEnum.HOSPITAL_IS_NOT_EXISTS);
         }
         return info;
     }
@@ -123,9 +121,16 @@ public class HospitalServiceImpl implements IHospitalService {
     public Boolean insertByBo(HospitalBo bo) {
         Hospital add = BeanUtil.toBean(bo, Hospital.class);
         validEntityBeforeSave(add);
+        //  生成省市区
+        add.setProvinceName(sysCnAreaService.getByCode(bo.getProvinceId()).getLabel());
+        add.setCityName(sysCnAreaService.getByCode(bo.getCityId()).getLabel());
+        add.setAreaName(sysCnAreaService.getByCode(bo.getAreaId()).getLabel());
+
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+
+            // TODO 生成小程序二维码
         }
         return flag;
     }
@@ -139,6 +144,9 @@ public class HospitalServiceImpl implements IHospitalService {
     @Override
     public Boolean updateByBo(HospitalBo bo) {
         Hospital hospital = baseMapper.selectById(bo.getId());
+        if (ObjectUtil.isNull(hospital)) {
+            throw new ServiceException(HospitalExceptionEnum.HOSPITAL_IS_NOT_EXISTS);
+        }
         Hospital update = BeanCopyUtils.copy(bo, hospital);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
@@ -150,7 +158,24 @@ public class HospitalServiceImpl implements IHospitalService {
      * @param entity 实体类数据
      */
     private void validEntityBeforeSave(Hospital entity){
-        //TODO 做一些数据校验,如唯一约束
+        // 医院名称不可重复
+        LambdaQueryWrapper<Hospital> lqw = new LambdaQueryWrapper<Hospital>()
+            .eq(Hospital::getName, entity.getName());
+        List<Hospital> hospitalList = baseMapper.selectList(lqw);
+        if (CollUtil.isNotEmpty(hospitalList)) {
+            if (entity.getId() == null) {
+                // 新增校验
+                throw new ServiceException(HospitalExceptionEnum.HOSPITAL_NAME_ALREADY_EXISTS);
+            } else {
+                // 编辑校验
+                if (hospitalList.stream().anyMatch(hospital -> !hospital.getId().equals(entity.getId()))) {
+                    throw new ServiceException(HospitalExceptionEnum.HOSPITAL_NAME_ALREADY_EXISTS);
+                }
+            }
+
+        }
+
+
     }
 
     /**
@@ -167,4 +192,18 @@ public class HospitalServiceImpl implements IHospitalService {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 
+    @Override
+    public void updateRackStatus(HospitalRackUpdateBo bo) {
+        Hospital hospital = baseMapper.selectById(bo.getId());
+        if (hospital == null) {
+            throw new ServiceException(HospitalExceptionEnum.HOSPITAL_IS_NOT_EXISTS);
+        }
+
+        if (hospital.getRackStatus().equals(bo.getRackStatus())) {
+            return;
+        }
+        hospital.setRackStatus(bo.getRackStatus());
+        baseMapper.updateById(hospital);
+    }
+
 }