diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardListDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardListDto.java index ec6140ba1..d65a7310e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardListDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardListDto.java @@ -3,6 +3,7 @@ */ package com.openhis.web.cardmanagement.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @@ -51,9 +52,11 @@ public class DoctorCardListDto { private String diseaseName; /** 发病日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate onsetDate; /** 诊断日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime diagDate; /** 报告单位 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java index d01e4f396..a38d4325a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java @@ -1,5 +1,6 @@ package com.openhis.web.cardmanagement.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.time.LocalDate; @@ -30,6 +31,7 @@ public class InfectiousCardDto { private String sex; /** 出生日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate birthday; /** 实足年龄 */ @@ -87,12 +89,15 @@ public class InfectiousCardDto { private Integer caseClass; /** 发病日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate onsetDate; /** 诊断日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime diagDate; /** 死亡日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate deathDate; /** 订正病名 */ @@ -111,6 +116,7 @@ public class InfectiousCardDto { private String reportDoc; /** 填卡日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate reportDate; /** 状态(0暂存/1已提交/2已审核/3已上报/4失败/5退回/6作废) */ @@ -129,5 +135,6 @@ public class InfectiousCardDto { private String deptName; /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; }