From 51ae3aad2903f2f0dc5c1b93f1f5b15b072435b7 Mon Sep 17 00:00:00 2001 From: xiaoming <13564692840@163.com> Date: Fri, 15 May 2026 18:16:12 +0800 Subject: [PATCH] =?UTF-8?q?bug524=20[=E9=97=A8=E8=AF=8A/=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=8A=A5=E5=8D=A1=E7=AE=A1=E7=90=86]=20?= =?UTF-8?q?=E4=BC=A0=E6=9F=93=E7=97=85=E6=8A=A5=E5=91=8A=E5=8D=A1=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=90=8E=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=EF=BC=9A=E7=97=85=E4=BE=8B=E5=88=86=E7=B1=BB=E3=80=81?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8F=8A=E5=88=86=E5=9E=8B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/cardmanagement/dto/InfectiousCardDto.java | 3 +++ .../dto/InfectiousDiseaseReportDto.java | 6 +++++- .../diagnosis/infectiousDiseaseReportDialog.vue | 12 ++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) 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 e69466ef5..d01e4f396 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 @@ -83,6 +83,9 @@ public class InfectiousCardDto { /** 病例分类 */ private String diseaseType; + /** 病例分类 */ + private Integer caseClass; + /** 发病日期 */ private LocalDate onsetDate; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java index f3ae3f956..bf50eb72d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java @@ -112,12 +112,15 @@ public class InfectiousDiseaseReportDto { private Integer caseClass; /** 发病日期（默认诊断时间，病原携带者填初检日期） */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate onsetDate; /** 诊断日期（精确到小时） */ + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime diagDate; /** 死亡日期（死亡病例必填） */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate deathDate; /** 订正病名（订正报告必填） */ @@ -136,6 +139,7 @@ public class InfectiousDiseaseReportDto { private String reportDoc; /** 填卡日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate reportDate; /** 报卡名称代码 1-中华人民共和国传染病报告卡 */ @@ -160,4 +164,4 @@ public class InfectiousDiseaseReportDto { /** 医生ID */ @JsonSerialize(using = ToStringSerializer.class) private Long doctorId; -} \ No newline at end of file +} diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue index af201231a..95f681b30 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue @@ -1025,7 +1025,11 @@ function parseBirthDate(birthDate) { function normalizeDate(value) { if (!value) return ''; - return String(value).split(/[T ]/)[0]; + const datePart = String(value).split(/[T ]/)[0].replace(/\//g, '-'); + const parts = datePart.split('-'); + if (parts.length !== 3) return datePart; + const [year, month, day] = parts; + return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`; } function normalizeSex(value) { @@ -1116,7 +1120,7 @@ function showReport(reportData = {}, readOnly = true) { addressHouse: reportData.addressHouse || '', patientBelong: reportData.patientBelong || 1, occupation: reportData.occupation || '', - caseClass: reportData.diseaseType != null ? String(reportData.diseaseType) : '', + caseClass: reportData.caseClass != null ? String(reportData.caseClass) : '', onsetDate: normalizeDate(reportData.onsetDate), diagDate: normalizeDate(reportData.diagDate), deathDate: normalizeDate(reportData.deathDate), @@ -1125,7 +1129,7 @@ function showReport(reportData = {}, readOnly = true) { selectedClassB: diseaseSelection.selectedClassB, selectedClassC: diseaseSelection.selectedClassC, otherDisease: reportData.otherDisease || (diseaseCode === 'OTHER' ? reportData.diseaseName || '' : ''), - diseaseType: reportData.diseaseSubtype || '', + diseaseType: reportData.diseaseSubtype || reportData.diseaseType || '', reportOrg: reportData.reportOrg || '', reportOrgPhone: reportData.reportOrgPhone || '', reportDoc: reportData.reportDoc || '', @@ -1466,7 +1470,7 @@ async function buildSubmitData() { reportDate: formData.reportDate || null, cardNameCode: 1, // 默认中华人民共和国传染病报告卡 registrationSource: 1, // 默认门诊 - status: '', + status: null, deptId: props.deptId || null, doctorId: props.doctorId || null, };