From 8b018ce9bfd8fe4364b8f9274427e11d796e46cc Mon Sep 17 00:00:00 2001 From: gongzhenkun <1658878546@qq.com> Date: Tue, 28 Feb 2023 09:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E8=AF=8A=E8=AE=B0=E5=BD=95=E3=80=81?= =?UTF-8?q?=E6=82=A3=E8=80=85=E5=88=97=E8=A1=A8=E5=85=A8=E9=87=8F=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8F=8A=E5=AF=BC=E5=87=BA=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pc/TPatientController.java | 2 +- .../web/controller/pc/TRecordController.java | 2 +- .../resp/PcTPatientQueryByPageResp.java | 91 +++++++------- .../ruoyi/system/domain/resp/TRecordResp.java | 113 +++++++++--------- 4 files changed, 107 insertions(+), 101 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java index 8be93cc..946d838 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java @@ -63,7 +63,7 @@ public class TPatientController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody @Validated PcTPatintQueryByPageReq pcTPatintQueryByPageReq) { - startPage(); +// startPage(); List list = tPatientService.queryByPage(pcTPatintQueryByPageReq); //List list = tPatientService.selectTPatientList(tPatient); ExcelUtil util = new ExcelUtil(PcTPatientQueryByPageResp.class); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java index 0f43d2e..f1c4ac6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java @@ -68,7 +68,7 @@ public class TRecordController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody @Validated TRecordResultReq tRecord) { - startPage(); +// startPage(); List list = tRecordService.selectTRecordListWithoutResult(tRecord); if(CollectionUtils.isNotEmpty(list)){ list.stream().forEach(tRecordResp -> { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTPatientQueryByPageResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTPatientQueryByPageResp.java index 71f5935..9226731 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTPatientQueryByPageResp.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTPatientQueryByPageResp.java @@ -15,6 +15,7 @@ import java.util.Date; public class PcTPatientQueryByPageResp { /** ID */ + @Excel(name = "序号") @ApiModelProperty("id") private Long id; @@ -22,24 +23,24 @@ public class PcTPatientQueryByPageResp { @ApiModelProperty("腾讯openid") private String openId; + /** 名称 */ + @ApiModelProperty("名称") + @Excel(name = "姓名") + private String name; + /** 编号 */ @ApiModelProperty("编号") @Excel(name = "档案号") private String identifier; - /** 名称 */ - @ApiModelProperty("名称") - @Excel(name = "名称") - private String name; - - /** 电话 */ - @ApiModelProperty("电话") - @Excel(name = "电话") - private String phone; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("初次就诊时间") + @Excel(name = "初诊日期",dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date firstTime; /** 用户性别（0男 1女 2未知） */ @ApiModelProperty("用户性别（0男 1女 2未知）") - @Excel(name = "用户性别（0男 1女 2未知）") + @Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知") private String sex; /** 年龄 */ @@ -47,6 +48,41 @@ public class PcTPatientQueryByPageResp { @Excel(name = "年龄") private Integer age; + @ApiModelProperty("诊断次数") + @Excel(name = "累计诊断次数") + private int countRecords; + + /** 最后一次就诊时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最后诊断时间") + @Excel(name = "最后诊断时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date latestTime; + + /** 诊察医生 */ + @ApiModelProperty("诊察医生") + @Excel(name = "诊察医生") + private String doctorName; + + /** 医院ID */ + @ApiModelProperty("医院ID") + @Excel(name = "医院ID") + private Long hospitalId; + + /** 医院名称 */ + @ApiModelProperty("医院名称") + @Excel(name = "所属医院") + private String hospitalName; + + /** 电话 */ + @ApiModelProperty("电话") + @Excel(name = "手机号码") + private String phone; + + /** 基础疾病 */ + @ApiModelProperty("基础疾病") + @Excel(name = "基础疾病") + private String disease; + /** 身高 */ @ApiModelProperty("身高") private Integer height; @@ -59,11 +95,6 @@ public class PcTPatientQueryByPageResp { @ApiModelProperty("婚姻状态（0未婚 1已婚 2未知）") private String marriage; - /** 基础疾病 */ - @ApiModelProperty("基础疾病") - @Excel(name = "基础疾病") - private String disease; - /** 删除标志（0代表存在 2代表删除） */ @ApiModelProperty("删除标志（0代表存在 2代表删除） ") private String delFlag; @@ -78,36 +109,6 @@ public class PcTPatientQueryByPageResp { @ApiModelProperty("更新时间") private Date updateTime; - /** 最后一次就诊时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("最后诊断时间") - @Excel(name = "最后诊断时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date latestTime; - - @ApiModelProperty("诊断次数") - @Excel(name = "诊断次数") - private int countRecords; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("初次就诊时间") - @Excel(name = "初次就诊时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date firstTime; - - /** 基础疾病 */ - @ApiModelProperty("诊断医生") - @Excel(name = "诊断医生") - private String doctorName; - - /** 医院ID */ - @ApiModelProperty("医院ID") - @Excel(name = "医院ID") - private Long hospitalId; - - /** 医院名称 */ - @ApiModelProperty("医院名称") - @Excel(name = "医院名称") - private String hospitalName; - public Long getHospitalId() { return hospitalId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java index bfffe7f..58abedd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java @@ -11,68 +11,73 @@ import java.util.Date; public class TRecordResp { /** ID */ + @Excel(name = "序号") @ApiModelProperty("患者就诊记录id") private Long id; - @Excel(name = "编号") - @ApiModelProperty("编号") - private String identifier; + /** 患者 */ + @ApiModelProperty("患者id") + private Long patientId; /** 名称 */ - @Excel(name = "患者名称") + @Excel(name = "姓名") @ApiModelProperty("患者名称") private String patientName; - /** 患者 */ - @ApiModelProperty("患者id") - private Long patientId; - - @Excel(name = "医生名称") - @ApiModelProperty("医生名称") - private String doctorName; + @Excel(name = "档案号") + @ApiModelProperty("编号") + private String identifier; - @Excel(name = "医院名称") - @ApiModelProperty("医院名称") - private String hospitalName; + @Excel(name = "初诊日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("初诊时间") + private Date firstTime; - @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") + @Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知") @ApiModelProperty("用户性别") private String sex; /** 年龄 */ - @Excel(name = "患者年龄") + @Excel(name = "年龄") @ApiModelProperty("患者年龄") private Integer age; - /** 基础疾病 */ - @Excel(name = "基础疾病") - @ApiModelProperty("基础疾病") - private String disease; + @Excel(name = "诊察医生") + @ApiModelProperty("医生名称") + private String doctorName; + + @Excel(name = "所属医院") + @ApiModelProperty("医院名称") + private String hospitalName; + @Excel(name = "待诊时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("初诊时间") - private Date firstTime; + @ApiModelProperty("待诊时间") + private Date waitingTime; - /** 医生 */ - @ApiModelProperty("医生id") - private Long doctorId; + /** 上传时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "舌像上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("上传时间") + private Date uploadTime; - /** 医院 */ - @ApiModelProperty("医院id") - private Long hospitalId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "AI结果返回时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("ai结果返回时间") + private Date aiResultReturnTime; - /** 状态（0预约 1就诊） */ - @Excel(name = "状态", readConverterExp = "0=预约,1=就诊") - @ApiModelProperty("状态（0预约 1就诊）") - private String status; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "AI诊断修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("ai结果修改时间") + private Date aiResultModifyTime; /** ai诊断结果 */ - @Excel(name = "ai诊断结果") + @Excel(name = "AI诊断结果") @ApiModelProperty("ai诊断结果") private String aiResult; /** ai诊断结果，无图片 */ - @Excel(name = "ai诊断结果，无图片") +// @Excel(name = "ai诊断结果，无图片") @ApiModelProperty("ai诊断结果，无图片") private String aiResult2; @@ -82,43 +87,43 @@ public class TRecordResp private String updateResult; /** 医生诊断结果，无图片 */ - @Excel(name = "医生诊断结果，无图片") +// @Excel(name = "医生诊断结果，无图片") @ApiModelProperty("医生诊断结果，无图片") private String updateResult2; - /** 上传时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("上传时间") - private Date uploadTime; + /** 状态（0预约 1就诊） */ + @Excel(name = "诊断状态", readConverterExp = "0=预约,1=就诊,2=AI分析中,3=未检测到舌") + @ApiModelProperty("状态（0预约 1就诊）") + private String status; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("待诊时间") - private Date waitingTime; + /** 基础疾病 */ + @Excel(name = "基础疾病") + @ApiModelProperty("基础疾病") + private String disease; + + /** 医生 */ + @ApiModelProperty("医生id") + private Long doctorId; + + /** 医院 */ + @ApiModelProperty("医院id") + private Long hospitalId; /** 舌下 */ - @Excel(name = "舌下") +// @Excel(name = "舌下") @ApiModelProperty("舌下") private String imgSx; /** 舌上 */ - @Excel(name = "舌上") +// @Excel(name = "舌上") @ApiModelProperty("舌上") private String imgSm; /** 响应时长 */ - @Excel(name = "响应时长") +// @Excel(name = "响应时长") @ApiModelProperty("响应时长") private Long responseTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("ai结果返回时间") - private Date aiResultReturnTime; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("ai结果修改时间") - private Date aiResultModifyTime; - public String getHospitalName() { return hospitalName; }