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 f1c4ac6..e4a9f54 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 @@ -237,7 +237,7 @@ public class TRecordController extends BaseController //如果包含舌苔 if(StringUtils.isNotEmpty(dataObject.getString("shetai")) && null != JSON.parseObject(dataObject.getString("shetai"))){ - resultBuilder.append("\n舌苔"); + resultBuilder.append("\n\n舌苔"); JSONObject shetaiObject = JSON.parseObject(dataObject.getString("shetai")); if(StringUtils.isNotEmpty(shetaiObject.getString("st_color")) && null != JSON.parseObject(shetaiObject.getString("st_color"))){ @@ -248,7 +248,7 @@ public class TRecordController extends BaseController //如果包含舌下脉络 if(StringUtils.isNotEmpty(dataObject.getString("shexia")) && null != JSON.parseObject(dataObject.getString("shexia"))){ - resultBuilder.append("\n舌下脉络"); + resultBuilder.append("\n\n舌下脉络"); JSONObject shexiaObject = JSON.parseObject(dataObject.getString("shexia")); if(StringUtils.isNotEmpty(shexiaObject.getString("sx_vein_color")) && null != JSON.parseObject(shexiaObject.getString("sx_vein_color"))){ 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 9226731..a6a97ac 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 @@ -65,7 +65,7 @@ public class PcTPatientQueryByPageResp { /** 医院ID */ @ApiModelProperty("医院ID") - @Excel(name = "医院ID") +// @Excel(name = "医院ID") private Long 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 58abedd..a9a4389 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 @@ -28,7 +28,7 @@ public class TRecordResp @ApiModelProperty("编号") private String identifier; - @Excel(name = "初诊日期") + @Excel(name = "初诊日期",dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("初诊时间") private Date firstTime; @@ -50,7 +50,7 @@ public class TRecordResp @ApiModelProperty("医院名称") private String hospitalName; - @Excel(name = "待诊时间") + @Excel(name = "待诊时间",dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("待诊时间") private Date waitingTime;