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 2e7a5798..7e0beb31 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue @@ -1071,7 +1071,7 @@ function showReport(reportData = {}, readOnly = true) { addressHouse: reportData.addressHouse || '', patientBelong: reportData.patientBelong || 1, occupation: reportData.occupation || '', - caseClass: reportData.caseClass != null ? String(reportData.caseClass) : '', + caseClass: reportData.diseaseType != null ? String(reportData.diseaseType) : '', onsetDate: normalizeDate(reportData.onsetDate), diagDate: normalizeDate(reportData.diagDate), deathDate: normalizeDate(reportData.deathDate), @@ -1080,13 +1080,13 @@ function showReport(reportData = {}, readOnly = true) { selectedClassB: diseaseSelection.selectedClassB, selectedClassC: diseaseSelection.selectedClassC, otherDisease: reportData.otherDisease || (diseaseCode === 'OTHER' ? reportData.diseaseName || '' : ''), - diseaseType: reportData.diseaseType || '', + diseaseType: reportData.diseaseSubtype || '', reportOrg: reportData.reportOrg || '', reportOrgPhone: reportData.reportOrgPhone || '', reportDoc: reportData.reportDoc || '', reportDate: normalizeDate(reportData.reportDate || reportData.createdAt), - correctName: reportData.correctName || '', - withdrawReason: reportData.withdrawReason || '', + correctName: reportData.revisedDiseaseName || '', + withdrawReason: reportData.returnReason || '', remark: reportData.remark || '', encounterId: reportData.encounterId || reportData.visitId || '', patientId: reportData.patientId || reportData.patId || '',