Merge remote-tracking branch 'origin/develop' into develop

2026-03-19 10:25:59 +08:00
parent 3bfe25c2f2 266b06114a
commit d41d3066b3
30 changed files with 3170 additions and 294 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -1314,7 +1314,7 @@ async function buildSubmitData() {
    reportDate: formData.reportDate || null,
    cardNameCode: 1, // 默认中华人民共和国传染病报告卡
    registrationSource: 1, // 默认门诊
-    status: 0,
+    status: '',
    deptId: props.deptId || null,
    doctorId: props.doctorId || null,
  };