From d1708b4b2bc6596f9c62354274f1af97be45401c Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 28 十一月 2024 14:40:46 +0800 Subject: [PATCH] 按工位的多个检查项目 抢占 排队中 患者 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java index 15ecc0b..d45497a 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java @@ -1,11 +1,17 @@ package cn.lihu.jh.module.ecg.controller.admin.queue.vo; +import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.time.LocalDate; +import java.util.List; +import java.util.Map; @Schema(description = "绠$悊鍚庡彴 - 鎺掗槦鏂板/淇敼 Request VO") @@ -14,6 +20,12 @@ @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21320") private Integer id; + + @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024435") + private String episodeId; + + @Schema(description = "鍐呴儴棰勭害缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "21320") + private Long appointId; @Schema(description = "鎮h�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "30473") @NotEmpty(message = "鎮h�呯紪鍙蜂笉鑳戒负绌�") @@ -26,6 +38,9 @@ @Schema(description = "鎮h�呮�у埆") private Byte patGender; + @Schema(description = "鎮h�呰鎯�") + private PatDetails patDetails; + @Schema(description = "棰勭害鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "棰勭害鏃ユ湡涓嶈兘涓虹┖") private LocalDate bookDate; @@ -35,15 +50,23 @@ private Integer bookTimeslot; @Schema(description = "棰勭害妫�鏌ョ被鍨�", example = "1") - private Byte bookCheckType; + private Integer bookCheckType; + + @Schema(description = "棰勭害搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED) + //@NotNull(message = "棰勭害搴忓彿涓嶈兘涓虹┖") + private Integer bookSeqNum; + + @Schema(description = "鏄惁VIP", requiredMode = Schema.RequiredMode.REQUIRED) + //@NotNull(message = "鏄惁VIP") + private Integer isVip; @Schema(description = "鎺掗槦搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "鎺掗槦搴忓彿涓嶈兘涓虹┖") private Integer seqNum; - @Schema(description = "10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 涓嶈兘涓虹┖") - private Byte status; + @Schema(description = "5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 ", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 涓嶈兘涓虹┖") + private Integer status; @Schema(description = "杩囧彿鏍囪", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "杩囧彿鏍囪涓嶈兘涓虹┖") @@ -53,6 +76,8 @@ @NotNull(message = "棰勭害杩囨湡鏍囪涓嶈兘涓虹┖") private Byte expired; + private Integer affinityItem; + @Schema(description = "璇婂缂栧彿") private Long roomId; @@ -61,5 +86,5 @@ @Schema(description = "璇婄枟搴婄紪鍙�") private String bedNo; +} -} \ No newline at end of file -- Gitblit v1.9.3