From e7fd28347750bea43d4457f6c19217b8b07f469c Mon Sep 17 00:00:00 2001 From: gongzhenkun <1658878546@qq.com> Date: Thu, 16 Mar 2023 11:49:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E8=AF=8A=E3=80=81=E6=82=A3=E8=80=85?= =?UTF-8?q?=E3=80=81=E5=8C=BB=E7=94=9F=E5=AF=BC=E5=87=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pc/TDoctorController.java | 5 +- .../web/controller/pc/TPatientController.java | 3 + .../web/controller/pc/TRecordController.java | 39 +++++--- .../domain/resp/PcTDoctorQueryByPageResp.java | 88 ++++++++++--------- 4 files changed, 82 insertions(+), 53 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java index 581ca37..abd01e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java @@ -70,8 +70,11 @@ public class TDoctorController extends BaseController public void export(HttpServletResponse response, @RequestBody @Validated PcTDoctorQueryByPageReq pcTDoctorQueryByPageReq) { // List list = tDoctorService.selectTDoctorList(tDoctor); - startPage(); +// startPage(); List list = tDoctorService.queryByPage(pcTDoctorQueryByPageReq); + for(int i=0;i util = new ExcelUtil(PcTDoctorQueryByPageResp.class); util.exportExcel(response, list, "医生信息数据"); } 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 946d838..d687c87 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 @@ -65,6 +65,9 @@ public class TPatientController extends BaseController { // startPage(); List list = tPatientService.queryByPage(pcTPatintQueryByPageReq); + for(int i=0;i list = tPatientService.selectTPatientList(tPatient); ExcelUtil util = new ExcelUtil(PcTPatientQueryByPageResp.class); util.exportExcel(response, list, "患者信息数据"); 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 17df833..c502066 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 @@ -71,24 +71,43 @@ public class TRecordController extends BaseController // startPage(); List list = tRecordService.selectTRecordListWithoutResult(tRecord); if(CollectionUtils.isNotEmpty(list)){ - list.stream().forEach(tRecordResp -> { +// list.stream().forEach(tRecordResp -> { +// StringBuilder updateResult = new StringBuilder(); +// if(StringUtils.isNotEmpty(tRecordResp.getUpdateResult()) +// && null != JSON.parseObject(tRecordResp.getUpdateResult())){ +// typeAppend(tRecordResp.getUpdateResult(),updateResult); +// } +// if(updateResult.length() != 0){ +// tRecordResp.setUpdateResult(updateResult.toString()); +// } +// StringBuilder aiResult = new StringBuilder(); +// if(StringUtils.isNotEmpty(tRecordResp.getAiResult()) +// && null != JSON.parseObject(tRecordResp.getAiResult())){ +// typeAppend(tRecordResp.getAiResult(),aiResult); +// } +// if(aiResult.length() != 0){ +// tRecordResp.setAiResult(aiResult.toString()); +// } +// }); + for(int i=0;i util = new ExcelUtil<>(TRecordResp.class); util.exportExcel(response, list, "诊断记录信息数据"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java index 6d1a329..0119817 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java @@ -16,27 +16,67 @@ public class PcTDoctorQueryByPageResp { /** ID */ @ApiModelProperty("id") + @Excel(name = "序号") private Long id; /** 用户ID */ @ApiModelProperty("用户ID") private Long userId; + /** 名称 */ + @ApiModelProperty("名称") + @Excel(name = "姓名") + private String name; + /** 编号 */ @ApiModelProperty("编号") @Excel(name = "工作证号") private String identifier; - /** 名称 */ - @ApiModelProperty("名称") - @Excel(name = "名称") - private String name; - /** 电话 */ @ApiModelProperty("电话") - @Excel(name = "电话") + @Excel(name = "手机号") private String phone; + /** 医院 */ + @ApiModelProperty("医院id") + private Long hospitalId; + + /** 医院 */ + @ApiModelProperty("医院名称") + @Excel(name = "所属医院") + private String hospitalName; + + /** 最近一次就诊时间 */ + @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; + + @ApiModelProperty("患者个数") + @Excel(name = "累计患者个数") + private int countPatints; + + /** 职称 */ + @ApiModelProperty("职称") + @Excel(name = "职称") + private String title; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") + @Excel(name = "注册时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 删除标志（0代表存在 2代表删除） */ + @ApiModelProperty("删除标志（0代表存在 2代表删除） ") + @Excel(name = "是否删除", readConverterExp = "0=正常,2=已删除") + private String delFlag; + /** 用户性别（0男 1女 2未知） */ @ApiModelProperty("用户性别（0男 1女 2未知） ") private String sex; @@ -49,10 +89,6 @@ public class PcTDoctorQueryByPageResp { @ApiModelProperty("婚姻状态（0未婚 1已婚 2未知）") private String marriage; - /** 职称 */ - @ApiModelProperty("职称") - private String title; - /** 专长 */ @ApiModelProperty("专长") private String speciality; @@ -72,43 +108,11 @@ public class PcTDoctorQueryByPageResp { @ApiModelProperty("二维码base64") private String qrCode; - /** 医院 */ - @ApiModelProperty("医院id") - private Long hospitalId; - - /** 医院 */ - @ApiModelProperty("医院名称") - private String hospitalName; - - /** 删除标志（0代表存在 2代表删除） */ - @ApiModelProperty("删除标志（0代表存在 2代表删除） ") - private String delFlag; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("创建时间") - @Excel(name = "注册时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("更新时间") private Date updateTime; - @ApiModelProperty("患者个数") - @Excel(name = "患者个数") - private int countPatints; - - /** 最近一次就诊时间 */ - @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; - public String getHospitalName() { return hospitalName; }