From b5ad59b3685fdc6c25495205acbc2b56af7aafdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=BD=B3=E7=82=9C?= <1503983799@qq.com> Date: Mon, 17 Feb 2025 14:38:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?tb=5Fpatientitems=E6=B7=BB=E5=8A=A0analyse?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=20tb=5Fpatient=E6=B7=BB=E5=8A=A0auditStat?= =?UTF-8?q?us=E3=80=81inspectionOpinion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectpatient/vo/InspectPatientPageReqVO.java | 6 ++++++ .../admin/inspectpatient/vo/InspectPatientRespVO.java | 8 ++++++++ .../inspectpatient/vo/InspectPatientSaveReqVO.java | 6 ++++++ .../vo/InspectPatientitemsPageReqVO.java | 3 +++ .../vo/InspectPatientitemsRespVO.java | 4 ++++ .../vo/InspectPatientitemsSaveReqVO.java | 3 +++ .../dataobject/inspectpatient/InspectPatientDO.java | 10 ++++++++++ .../inspectpatientitems/InspectPatientitemsDO.java | 5 +++++ 8 files changed, 45 insertions(+) diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java index 6a55dce..87e1f14 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java @@ -79,4 +79,10 @@ public class InspectPatientPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] auditorTime; + @Schema(description = "审核状态") + private Integer auditStatus; + + @Schema(description = "总检意见") + private Integer inspectionOpinion; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java index d80100e..4d49981 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java @@ -98,4 +98,12 @@ public class InspectPatientRespVO { @ExcelProperty("审核时间") private LocalDateTime auditorTime; + @Schema(description = "审核状态") + @ExcelProperty("审核状态") + private Integer auditStatus; + + @Schema(description = "总检意见") + @ExcelProperty("总检意见") + private Integer inspectionOpinion; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java index 9f03ae5..3fad89a 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java @@ -75,4 +75,10 @@ public class InspectPatientSaveReqVO { @Schema(description = "审核时间") private LocalDateTime auditorTime; + @Schema(description = "审核状态") + private Integer auditStatus; + + @Schema(description = "总检意见") + private Integer inspectionOpinion; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsPageReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsPageReqVO.java index cac78cd..3681d08 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsPageReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsPageReqVO.java @@ -58,4 +58,7 @@ public class InspectPatientitemsPageReqVO extends PageParam { @Schema(description = "是否阳性 1：阳性") private String positive; + @Schema(description = "根据检查结论分析") + private String analyse; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsRespVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsRespVO.java index 988a010..29a3519 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsRespVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsRespVO.java @@ -71,4 +71,8 @@ public class InspectPatientitemsRespVO { @ExcelProperty("是否阳性 1：阳性") private String positive; + @Schema(description = "根据检查结论分析") + @ExcelProperty("根据检查结论分析") + private String analyse; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsSaveReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsSaveReqVO.java index a9555d2..ac258c2 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsSaveReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsSaveReqVO.java @@ -59,4 +59,7 @@ public class InspectPatientitemsSaveReqVO { @Schema(description = "是否阳性 1：阳性") private String positive; + @Schema(description = "根据检查结论分析") + private String analyse; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java index 2614f5d..3765b0e 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java @@ -124,5 +124,15 @@ public class InspectPatientDO { */ @TableField("auditorTime") private LocalDateTime auditorTime; + /** + * 审核状态 + */ + @TableField("auditStatus") + private Integer auditStatus; + /** + * 总检意见 + */ + @TableField("inspectionOpinion") + private String inspectionOpinion; } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatientitems/InspectPatientitemsDO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatientitems/InspectPatientitemsDO.java index bd40923..38076ac 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatientitems/InspectPatientitemsDO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatientitems/InspectPatientitemsDO.java @@ -98,5 +98,10 @@ public class InspectPatientitemsDO { */ @TableField("positive") private String positive; + /** + * 根据检查结论分析 + */ + @TableField("analyse") + private String analyse; } \ No newline at end of file From 2021485207d87898bb5734bc6f6e6b0da876b356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=BD=B3=E7=82=9C?= <1503983799@qq.com> Date: Mon, 17 Feb 2025 16:01:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?tb=5Fpatientitems=E6=B7=BB=E5=8A=A0analyse?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=20tb=5Fpatient=E6=B7=BB=E5=8A=A0auditStat?= =?UTF-8?q?us=E3=80=81inspectionOpinion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/inspectpatient/vo/InspectPatientPageReqVO.java | 2 +- .../admin/inspectpatient/vo/InspectPatientRespVO.java | 2 +- .../admin/inspectpatient/vo/InspectPatientSaveReqVO.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java index 87e1f14..17c2c8b 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java @@ -83,6 +83,6 @@ public class InspectPatientPageReqVO extends PageParam { private Integer auditStatus; @Schema(description = "总检意见") - private Integer inspectionOpinion; + private String inspectionOpinion; } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java index 4d49981..0ce73cc 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java @@ -104,6 +104,6 @@ public class InspectPatientRespVO { @Schema(description = "总检意见") @ExcelProperty("总检意见") - private Integer inspectionOpinion; + private String inspectionOpinion; } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java index 3fad89a..46d61e1 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java @@ -79,6 +79,6 @@ public class InspectPatientSaveReqVO { private Integer auditStatus; @Schema(description = "总检意见") - private Integer inspectionOpinion; + private String inspectionOpinion; } \ No newline at end of file