jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
@@ -6,4 +6,7 @@ static final String ECG_SCREEN_PANE_WAITING_KEY = "ecg.screen.pane.waiting"; static final String ECG_SCREEN_PANE_PASSED_KEY = "ecg.screen.pane.passed"; static final String DEV_CODE_CHOICE = "dev.code.choice"; static final String BOOK_TIMESLOT_LENGTH = "book.timeslot.length"; static final String BOOK_TIMESLOT_LIST = "book.timeslot.list"; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java
@@ -1,12 +1,16 @@ package cn.lihu.jh.module.ecg.controller.admin.checktype; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; @@ -24,11 +28,6 @@ import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO; import cn.lihu.jh.module.ecg.service.checktype.CheckTypeService; import javax.annotation.Resource; import javax.annotation.security.PermitAll; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @Tag(name = "管理后台 - 检查类型") @RestController jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java
@@ -34,4 +34,19 @@ @Schema(description = "叫号列") private Integer callingColumn; @Schema(description = "是否显示患者条码") private Integer displayBarcode; @Schema(description = "是否需要确费") private Integer expenseRecognition; @Schema(description = "时段预约规定人数") private Integer timeslotBookNum; @Schema(description = "每时段预留人数") private Integer timeslotReservedNum; @Schema(description = "亲和的检查类型") private String affinityCheckTypes; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java
@@ -6,6 +6,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; import cn.lihu.jh.framework.excel.core.annotations.DictFormat; import cn.lihu.jh.framework.excel.core.convert.DictConvert; @Schema(description = "管理后台 - 检查类型 Response VO") @Data @@ -33,11 +35,32 @@ private LocalDateTime createTime; @Schema(description = "需要设备领用") @ExcelProperty("需要设备领用") @ExcelProperty(value = "需要设备领用", converter = DictConvert.class) @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 private Integer needDevReady; @Schema(description = "叫号列") @ExcelProperty("叫号列") private Integer callingColumn; @Schema(description = "是否显示患者条码") @ExcelProperty("是否显示患者条码") private Integer displayBarcode; @Schema(description = "是否需要确费") @ExcelProperty("是否需要确费") private Integer expenseRecognition; @Schema(description = "时段预约规定人数") @ExcelProperty("时段预约规定人数") private Integer timeslotBookNum; @Schema(description = "每时段预留人数") @ExcelProperty("每时段预留人数") private Integer timeslotReservedNum; @Schema(description = "亲和的检查类型") @ExcelProperty("亲和的检查类型") private String affinityCheckTypes; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java
@@ -1,8 +1,9 @@ package cn.lihu.jh.module.ecg.controller.admin.checktype.vo; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 检查类型新增/修改 Request VO") @Data @@ -26,4 +27,19 @@ @Schema(description = "叫号列") private Integer callingColumn; @Schema(description = "是否显示患者条码") private Integer displayBarcode; @Schema(description = "是否需要确费") private Integer expenseRecognition; @Schema(description = "时段预约规定人数") private Integer timeslotBookNum; @Schema(description = "每时段预留人数") private Integer timeslotReservedNum; @Schema(description = "亲和的检查类型") private String affinityCheckTypes; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java
@@ -41,11 +41,33 @@ private Integer readyNum; /** * 需要设备领用 * * 枚举 {@link TODO infra_boolean_string 对应的类} */ private Integer needDevReady; /** * 叫号列 */ private Integer callingColumn; /** * 是否显示患者条码 */ private Integer displayBarcode; /** * 是否需要确费 */ private Integer expenseRecognition; /** * 时段预约规定人数 */ private Integer timeslotBookNum; /** * 每时段预留人数 */ private Integer timeslotReservedNum; /** * 亲和的检查类型 */ private String affinityCheckTypes; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
@@ -6,10 +6,9 @@ import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX; import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO; import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; import cn.lihu.jh.module.ecg.enums.BedStatusEnum; import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.Mapper; import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*; import org.apache.ibatis.annotations.Select; /** * 检查类型 Mapper @@ -26,6 +25,12 @@ .eqIfPresent(CheckTypeDO::getReadyNum, reqVO.getReadyNum()) .betweenIfPresent(CheckTypeDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(CheckTypeDO::getNeedDevReady, reqVO.getNeedDevReady()) .eqIfPresent(CheckTypeDO::getCallingColumn, reqVO.getCallingColumn()) .eqIfPresent(CheckTypeDO::getDisplayBarcode, reqVO.getDisplayBarcode()) .eqIfPresent(CheckTypeDO::getExpenseRecognition, reqVO.getExpenseRecognition()) .eqIfPresent(CheckTypeDO::getTimeslotBookNum, reqVO.getTimeslotBookNum()) .eqIfPresent(CheckTypeDO::getTimeslotReservedNum, reqVO.getTimeslotReservedNum()) .eqIfPresent(CheckTypeDO::getAffinityCheckTypes, reqVO.getAffinityCheckTypes()) .orderByDesc(CheckTypeDO::getId)); }
@@ -1,11 +1,11 @@ package cn.lihu.jh.module.ecg.service.checktype; import java.util.*; import jakarta.validation.*; import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO; import cn.lihu.jh.framework.common.pojo.PageResult; import javax.validation.Valid; import java.util.List; import cn.lihu.jh.framework.common.pojo.PageParam; /** * 检查类型 Service 接口 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeServiceImpl.java
@@ -1,18 +1,18 @@ package cn.lihu.jh.module.ecg.service.checktype; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO; import cn.lihu.jh.framework.common.pojo.PageResult; import cn.lihu.jh.framework.common.pojo.PageParam; import cn.lihu.jh.framework.common.util.object.BeanUtils; import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper; import javax.annotation.Resource; import java.util.List; import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
