diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java index 11174386c..2a1fd9356 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java @@ -36,6 +36,9 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.Date; import java.util.*; @@ -598,6 +601,25 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn InfectiousDiseaseReport infectiousDiseaseReport = new InfectiousDiseaseReport(); BeanUtils.copyProperties(infectiousDiseaseReportDto, infectiousDiseaseReport); + // BeanUtils.copyProperties 不支持 LocalDate/LocalDateTime 到 java.util.Date 的类型转换,需手动处理 + if (infectiousDiseaseReportDto.getOnsetDate() != null) { + infectiousDiseaseReport.setOnsetDate( + Date.from(infectiousDiseaseReportDto.getOnsetDate().atStartOfDay(ZoneId.systemDefault()).toInstant())); + } + if (infectiousDiseaseReportDto.getDiagDate() != null) { + infectiousDiseaseReport.setDiagDate( + Date.from(infectiousDiseaseReportDto.getDiagDate().atZone(ZoneId.systemDefault()).toInstant())); + } + // deathDate / reportDate 同理 + if (infectiousDiseaseReportDto.getDeathDate() != null) { + infectiousDiseaseReport.setDeathDate( + Date.from(infectiousDiseaseReportDto.getDeathDate().atStartOfDay(ZoneId.systemDefault()).toInstant())); + } + if (infectiousDiseaseReportDto.getReportDate() != null) { + infectiousDiseaseReport.setReportDate( + Date.from(infectiousDiseaseReportDto.getReportDate().atStartOfDay(ZoneId.systemDefault()).toInstant())); + } + /** * 设置创建人、删除状态、租户ID */