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 71bfaece..50d46b8a 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -1,11 +1,11 @@
 <template>
   <el-dialog
-    v-model="dialogVisible"
-    width="1100px"
-    append-to-body
-    destroy-on-close
-    :show-close="true"
-    @close="handleClose"
+      v-model="dialogVisible"
+      width="1100px"
+      append-to-body
+      destroy-on-close
+      :show-close="true"
+      @close="handleClose"
   >
     <template #header>
       <el-card class="report-header" shadow="never">
@@ -13,10 +13,10 @@
         <el-space align="center" class="card-number-row">
           <span class="card-number-label">卡片编号：</span>
           <el-input
-            v-model="form.cardNo"
-            class="card-number-input"
-            placeholder="系统自动生成"
-            disabled
+              v-model="form.cardNo"
+              class="card-number-input"
+              placeholder="单位自编，与网络直报一致"
+              maxlength="12"
           />
         </el-space>
       </el-card>
@@ -32,7 +32,7 @@
           </el-col>
           <el-col :span="8" class="form-item">
             <span :class="['form-label', isChildPatient ? 'required' : '']">家长姓名</span>
-            <el-input v-model="form.parentName" class="underline-input" :placeholder="isChildPatient ? '14岁以下必填' : ''" />
+            <el-input v-model="form.parentName" class="underline-input" :placeholder="isChildPatient ? '≤14岁必填' : ''" />
           </el-col>
           <el-col :span="8" class="form-item">
             <span class="form-label required">身份证号</span>
@@ -98,23 +98,29 @@
         <el-row :gutter="16" class="form-row">
           <el-col :span="24" class="form-item full-width">
             <span class="form-label required">现住地址</span>
-            <div class="address-inputs region-selects-wrapper">
-              <el-cascader
-                v-model="addressCodes"
-                :options="addressOptions"
-                :props="addressCascaderProps"
-                placeholder="请选择省/市/区县/街道"
-                clearable
-                @change="handleAddressChange"
-              />
+            <div class="address-selects">
+              <el-select v-model="provinceCode" placeholder="省" clearable @change="handleProvinceChange">
+                <el-option v-for="item in provinceOptions" :key="item.code" :label="item.name" :value="item.code" />
+              </el-select>
+              <el-select v-model="cityCode" placeholder="市" clearable @change="handleCityChange">
+                <el-option v-for="item in cityOptions" :key="item.code" :label="item.name" :value="item.code" />
+              </el-select>
+              <el-select v-model="countyCode" placeholder="区县" clearable @change="handleCountyChange">
+                <el-option v-for="item in countyOptions" :key="item.code" :label="item.name" :value="item.code" />
+              </el-select>
             </div>
           </el-col>
         </el-row>
         <el-row :gutter="16" class="form-row">
-          <el-col :span="12" class="form-item">
+          <el-col :span="8" class="form-item">
+            <el-select v-model="townCode" placeholder="街道" clearable @change="handleTownChange" class="underline-select">
+              <el-option v-for="item in townOptions" :key="item.code" :label="item.name" :value="item.code" />
+            </el-select>
+          </el-col>
+          <el-col :span="8" class="form-item">
             <el-input v-model="form.addressVillage" class="underline-input" placeholder="村（居）" />
           </el-col>
-          <el-col :span="12" class="form-item">
+          <el-col :span="8" class="form-item">
             <el-input v-model="form.addressHouse" class="underline-input" placeholder="门牌号" />
           </el-col>
         </el-row>
@@ -135,26 +141,27 @@
         </el-row>
 
         <!-- 职业 -->
+        <!-- 职业、病例分类 -->
         <el-row :gutter="16" class="form-row">
-          <el-col :span="24" class="form-item">
+          <el-col :span="8" class="form-item">
             <span class="form-label required">职业</span>
             <el-select v-model="form.occupation" placeholder="请选择职业" class="full-select">
               <el-option v-for="item in occupationList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-col>
-        </el-row>
-
-        <!-- 病例分类 -->
-        <el-row :gutter="16" class="form-row">
-          <el-col :span="24" class="form-item full-width">
+          <el-col :span="16" class="form-item">
             <span class="form-label required">病例分类</span>
-            <el-radio-group v-model="form.caseClass">
-              <el-radio label="1">疑似病例</el-radio>
-              <el-radio label="2">临床诊断病例</el-radio>
-              <el-radio label="3">确诊病例</el-radio>
-              <el-radio label="4">病原携带者</el-radio>
-              <el-radio label="5">阳性检测结果</el-radio>
-            </el-radio-group>
+            <div class="case-class-group">
+              <div class="case-class-row">
+                <el-radio v-model="form.caseClass" label="1">疑似病例</el-radio>
+                <el-radio v-model="form.caseClass" label="2">临床诊断病例</el-radio>
+                <el-radio v-model="form.caseClass" label="3">确诊病例</el-radio>
+              </div>
+              <div class="case-class-row">
+                <el-radio v-model="form.caseClass" label="4">病原携带者</el-radio>
+                <el-radio v-model="form.caseClass" label="5">阳性检测结果(采供血机构填写)</el-radio>
+              </div>
+            </div>
           </el-col>
         </el-row>
 
@@ -163,34 +170,34 @@
           <el-col :span="8" class="form-item">
             <span class="form-label required">发病日期</span>
             <el-date-picker
-              v-model="form.onsetDate"
-              type="date"
-              placeholder="选择日期"
-              class="full-width-picker"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
+                v-model="form.onsetDate"
+                type="date"
+                placeholder="选择日期"
+                class="full-width-picker"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
             />
           </el-col>
           <el-col :span="8" class="form-item">
             <span class="form-label required">诊断日期</span>
             <el-date-picker
-              v-model="form.diagDate"
-              type="date"
-              placeholder="选择日期"
-              class="full-width-picker"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
+                v-model="form.diagDate"
+                type="date"
+                placeholder="选择日期"
+                class="full-width-picker"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
             />
           </el-col>
           <el-col :span="8" class="form-item">
             <span class="form-label">死亡日期</span>
             <el-date-picker
-              v-model="form.deathDate"
-              type="date"
-              placeholder="选择日期"
-              class="full-width-picker"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
+                v-model="form.deathDate"
+                type="date"
+                placeholder="选择日期"
+                class="full-width-picker"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
             />
           </el-col>
         </el-row>
@@ -207,14 +214,14 @@
           <div class="disease-title">甲类传染病</div>
           <div class="disease-list">
             <el-checkbox
-              :model-value="form.selectedClassA === '0101'"
-              @update:model-value="(checked) => handleClassACheckbox('0101', checked)"
-              label="0101"
+                :model-value="form.selectedClassA === '0101'"
+                @update:model-value="(checked) => handleClassACheckbox('0101', checked)"
+                label="0101"
             >鼠疫</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassA === '0102'"
-              @update:model-value="(checked) => handleClassACheckbox('0102', checked)"
-              label="0102"
+                :model-value="form.selectedClassA === '0102'"
+                @update:model-value="(checked) => handleClassACheckbox('0102', checked)"
+                label="0102"
             >霍乱</el-checkbox>
           </div>
         </el-card>
@@ -224,130 +231,145 @@
           <div class="disease-title">乙类传染病</div>
           <div class="disease-list four-columns">
             <el-checkbox
-              :model-value="form.selectedClassB === '0201'"
-              @update:model-value="(checked) => handleClassBCheckbox('0201', checked)"
-              label="0201"
+                :model-value="form.selectedClassB === '0201'"
+                @update:model-value="(checked) => handleClassBCheckbox('0201', checked)"
+                label="0201"
             >传染性非典型肺炎</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0202'"
-              @update:model-value="(checked) => handleClassBCheckbox('0202', checked)"
-              label="0202"
+                :model-value="form.selectedClassB === '0202'"
+                @update:model-value="(checked) => handleClassBCheckbox('0202', checked)"
+                label="0202"
             >艾滋病</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0203'"
-              @update:model-value="(checked) => handleClassBCheckbox('0203', checked)"
-              label="0203"
+                :model-value="form.selectedClassB === '0203'"
+                @update:model-value="(checked) => handleClassBCheckbox('0203', checked)"
+                label="0203"
             >病毒性肝炎</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0204'"
-              @update:model-value="(checked) => handleClassBCheckbox('0204', checked)"
-              label="0204"
+                :model-value="form.selectedClassB === '0204'"
+                @update:model-value="(checked) => handleClassBCheckbox('0204', checked)"
+                label="0204"
             >脊髓灰质炎</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0205'"
-              @update:model-value="(checked) => handleClassBCheckbox('0205', checked)"
-              label="0205"
+                :model-value="form.selectedClassB === '0205'"
+                @update:model-value="(checked) => handleClassBCheckbox('0205', checked)"
+                label="0205"
             >人感染高致病性禽流感</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0206'"
-              @update:model-value="(checked) => handleClassBCheckbox('0206', checked)"
-              label="0206"
+                :model-value="form.selectedClassB === '0206'"
+                @update:model-value="(checked) => handleClassBCheckbox('0206', checked)"
+                label="0206"
             >麻疹</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0207'"
-              @update:model-value="(checked) => handleClassBCheckbox('0207', checked)"
-              label="0207"
+                :model-value="form.selectedClassB === '0207'"
+                @update:model-value="(checked) => handleClassBCheckbox('0207', checked)"
+                label="0207"
             >流行性出血热</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0208'"
-              @update:model-value="(checked) => handleClassBCheckbox('0208', checked)"
-              label="0208"
+                :model-value="form.selectedClassB === '0208'"
+                @update:model-value="(checked) => handleClassBCheckbox('0208', checked)"
+                label="0208"
             >狂犬病</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0209'"
-              @update:model-value="(checked) => handleClassBCheckbox('0209', checked)"
-              label="0209"
+                :model-value="form.selectedClassB === '0209'"
+                @update:model-value="(checked) => handleClassBCheckbox('0209', checked)"
+                label="0209"
             >流行性乙型脑炎</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0210'"
-              @update:model-value="(checked) => handleClassBCheckbox('0210', checked)"
-              label="0210"
+                :model-value="form.selectedClassB === '0210'"
+                @update:model-value="(checked) => handleClassBCheckbox('0210', checked)"
+                label="0210"
             >登革热</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0211'"
-              @update:model-value="(checked) => handleClassBCheckbox('0211', checked)"
-              label="0211"
+                :model-value="form.selectedClassB === '0211'"
+                @update:model-value="(checked) => handleClassBCheckbox('0211', checked)"
+                label="0211"
             >炭疽</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0212'"
-              @update:model-value="(checked) => handleClassBCheckbox('0212', checked)"
-              label="0212"
+                :model-value="form.selectedClassB === '0212'"
+                @update:model-value="(checked) => handleClassBCheckbox('0212', checked)"
+                label="0212"
             >细菌性和阿米巴性痢疾</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0213'"
-              @update:model-value="(checked) => handleClassBCheckbox('0213', checked)"
-              label="0213"
+                :model-value="form.selectedClassB === '0213'"
+                @update:model-value="(checked) => handleClassBCheckbox('0213', checked)"
+                label="0213"
             >肺结核</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0214'"
-              @update:model-value="(checked) => handleClassBCheckbox('0214', checked)"
-              label="0214"
+                :model-value="form.selectedClassB === '0214'"
+                @update:model-value="(checked) => handleClassBCheckbox('0214', checked)"
+                label="0214"
             >伤寒和副伤寒</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0215'"
-              @update:model-value="(checked) => handleClassBCheckbox('0215', checked)"
-              label="0215"
+                :model-value="form.selectedClassB === '0215'"
+                @update:model-value="(checked) => handleClassBCheckbox('0215', checked)"
+                label="0215"
             >流行性脑脊髓膜炎</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0216'"
-              @update:model-value="(checked) => handleClassBCheckbox('0216', checked)"
-              label="0216"
+                :model-value="form.selectedClassB === '0216'"
+                @update:model-value="(checked) => handleClassBCheckbox('0216', checked)"
+                label="0216"
             >百日咳</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0217'"
-              @update:model-value="(checked) => handleClassBCheckbox('0217', checked)"
-              label="0217"
+                :model-value="form.selectedClassB === '0217'"
+                @update:model-value="(checked) => handleClassBCheckbox('0217', checked)"
+                label="0217"
             >白喉</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0218'"
-              @update:model-value="(checked) => handleClassBCheckbox('0218', checked)"
-              label="0218"
+                :model-value="form.selectedClassB === '0218'"
+                @update:model-value="(checked) => handleClassBCheckbox('0218', checked)"
+                label="0218"
             >新生儿破伤风</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0219'"
-              @update:model-value="(checked) => handleClassBCheckbox('0219', checked)"
-              label="0219"
+                :model-value="form.selectedClassB === '0219'"
+                @update:model-value="(checked) => handleClassBCheckbox('0219', checked)"
+                label="0219"
             >猩红热</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0220'"
-              @update:model-value="(checked) => handleClassBCheckbox('0220', checked)"
-              label="0220"
+                :model-value="form.selectedClassB === '0220'"
+                @update:model-value="(checked) => handleClassBCheckbox('0220', checked)"
+                label="0220"
             >布鲁氏菌病</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0221'"
-              @update:model-value="(checked) => handleClassBCheckbox('0221', checked)"
-              label="0221"
-            >����病</el-checkbox>
+                :model-value="form.selectedClassB === '0221'"
+                @update:model-value="(checked) => handleClassBCheckbox('0221', checked)"
+                label="0221"
+            >淋病</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0222'"
-              @update:model-value="(checked) => handleClassBCheckbox('0222', checked)"
-              label="0222"
+                :model-value="form.selectedClassB === '0222'"
+                @update:model-value="(checked) => handleClassBCheckbox('0222', checked)"
+                label="0222"
             >梅毒</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0223'"
-              @update:model-value="(checked) => handleClassBCheckbox('0223', checked)"
-              label="0223"
+                :model-value="form.selectedClassB === '0223'"
+                @update:model-value="(checked) => handleClassBCheckbox('0223', checked)"
+                label="0223"
             >钩端螺旋体病</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0224'"
-              @update:model-value="(checked) => handleClassBCheckbox('0224', checked)"
-              label="0224"
+                :model-value="form.selectedClassB === '0224'"
+                @update:model-value="(checked) => handleClassBCheckbox('0224', checked)"
+                label="0224"
             >血吸虫病</el-checkbox>
             <el-checkbox
-              :model-value="form.selectedClassB === '0225'"
-              @update:model-value="(checked) => handleClassBCheckbox('0225', checked)"
-              label="0225"
+                :model-value="form.selectedClassB === '0225'"
+                @update:model-value="(checked) => handleClassBCheckbox('0225', checked)"
+                label="0225"
             >疟疾</el-checkbox>
+            <el-checkbox
+                :model-value="form.selectedClassB === '0226'"
+                @update:model-value="(checked) => handleClassBCheckbox('0226', checked)"
+                label="0226"
+            >新型冠状病毒肺炎</el-checkbox>
+            <el-checkbox
+                :model-value="form.selectedClassB === '0227'"
+                @update:model-value="(checked) => handleClassBCheckbox('0227', checked)"
+                label="0227"
+            >甲型H1N1流感</el-checkbox>
+            <el-checkbox
+                :model-value="form.selectedClassB === '0228'"
+                @update:model-value="(checked) => handleClassBCheckbox('0228', checked)"
+                label="0228"
+            >人感染H7N9禽流感</el-checkbox>
           </div>
         </el-card>
 
@@ -355,60 +377,61 @@
         <el-card class="disease-section">
           <div class="disease-title">丙类传染病</div>
           <div class="disease-list four-columns">
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0301'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0301', checked)"
-              label="0301"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0301'"
+                @update:model-value="(checked) => handleClassCCheckbox('0301', checked)"
+                label="0301"
             >流行性感冒</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0302'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0302', checked)"
-              label="0302"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0302'"
+                @update:model-value="(checked) => handleClassCCheckbox('0302', checked)"
+                label="0302"
             >流行性腮腺炎</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0303'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0303', checked)"
-              label="0303"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0303'"
+                @update:model-value="(checked) => handleClassCCheckbox('0303', checked)"
+                label="0303"
             >风疹</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0304'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0304', checked)"
-              label="0304"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0304'"
+                @update:model-value="(checked) => handleClassCCheckbox('0304', checked)"
+                label="0304"
             >急性出血性结膜炎</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0305'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0305', checked)"
-              label="0305"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0305'"
+                @update:model-value="(checked) => handleClassCCheckbox('0305', checked)"
+                label="0305"
             >麻风病</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0306'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0306', checked)"
-              label="0306"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0306'"
+                @update:model-value="(checked) => handleClassCCheckbox('0306', checked)"
+                label="0306"
             >流行性和地方性斑疹伤寒</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0307'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0307', checked)"
-              label="0307"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0307'"
+                @update:model-value="(checked) => handleClassCCheckbox('0307', checked)"
+                label="0307"
             >黑热病</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0308'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0308', checked)"
-              label="0308"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0308'"
+                @update:model-value="(checked) => handleClassCCheckbox('0308', checked)"
+                label="0308"
             >包虫病</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0309'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0309', checked)"
-              label="0309"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0309'"
+                @update:model-value="(checked) => handleClassCCheckbox('0309', checked)"
+                label="0309"
             >丝虫病</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0310'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0310', checked)"
-              label="0310"
-            >其它感染性腹泻病</el-checkbox>
-            <el-checkbox 
-              :model-value="form.selectedClassC === '0311'" 
-              @update:model-value="(checked) => handleClassCCheckbox('0311', checked)"
-              label="0311"
+            <el-checkbox
+                :model-value="form.selectedClassC === '0310'"
+                @update:model-value="(checked) => handleClassCCheckbox('0310', checked)"
+                label="0310"
+                class="wide-checkbox"
+            >除霍乱/菌痢/伤寒副伤寒以外的感染性腹泻病</el-checkbox>
+            <el-checkbox
+                :model-value="form.selectedClassC === '0311'"
+                @update:model-value="(checked) => handleClassCCheckbox('0311', checked)"
+                label="0311"
             >手足口病</el-checkbox>
           </div>
         </el-card>
@@ -422,15 +445,15 @@
           <el-col v-if="showSubtypeSelect" :span="8" class="form-item">
             <span class="form-label required">分型</span>
             <el-select
-              v-model="form.diseaseType"
-              placeholder="请选择分型"
-              class="full-select"
+                v-model="form.diseaseType"
+                placeholder="请选择分型"
+                class="full-select"
             >
               <el-option
-                v-for="option in currentSubtypeOptions"
-                :key="option.value"
-                :label="option.label"
-                :value="option.value"
+                  v-for="option in currentSubtypeOptions"
+                  :key="option.value"
+                  :label="option.label"
+                  :value="option.value"
               />
             </el-select>
           </el-col>
@@ -455,12 +478,12 @@
           <el-col :span="8" class="form-item">
             <span class="form-label required">填卡日期</span>
             <el-date-picker
-              v-model="form.reportDate"
-              type="date"
-              placeholder="选择日期"
-              class="full-width-picker"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
+                v-model="form.reportDate"
+                type="date"
+                placeholder="选择日期"
+                class="full-width-picker"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
             />
           </el-col>
           <el-col :span="8" class="form-item">
@@ -495,7 +518,7 @@
 <script setup>
 import { ref, computed, getCurrentInstance, watch } from 'vue';
 import pcas from 'china-division/dist/pcas-code.json';
-import { saveInfectiousDiseaseReport, getNextCardNo } from '../api';
+import { saveInfectiousDiseaseReport } from '../api';
 import useUserStore from '@/store/modules/user';
 import { useDict } from '@/utils/dict';
 
@@ -543,17 +566,151 @@ const props = defineProps({
 const emit = defineEmits(['close', 'success']);
 
 
-// 地址级联选择器配置
-const addressOptions = ref(pcas);
-const addressCodes = ref([]);
+// 地址选择器数据
+const addressData = ref(pcas);
+const provinceCode = ref('');
+const cityCode = ref('');
+const countyCode = ref('');
+const townCode = ref('');
+const provinceOptions = ref([]);
+const cityOptions = ref([]);
+const countyOptions = ref([]);
+const townOptions = ref([]);
+
 // 直辖市列表（这些城市的省级和市级相同）
 const municipalities = ['北京市', '天津市', '上海市', '重庆市'];
-const addressCascaderProps = {
-  checkStrictly: true,
-  value: 'code',
-  label: 'name',
-  children: 'children'
-};
+
+// 初始化省级选项
+function initProvinceOptions() {
+  provinceOptions.value = addressData.value.map(item => ({
+    code: item.code,
+    name: item.name
+  }));
+}
+
+// 省级变化处理
+function handleProvinceChange(code) {
+  cityCode.value = '';
+  countyCode.value = '';
+  townCode.value = '';
+  cityOptions.value = [];
+  countyOptions.value = [];
+  townOptions.value = [];
+  form.value.addressProv = '';
+  form.value.addressCity = '';
+  form.value.addressCounty = '';
+  form.value.addressTown = '';
+
+  if (code) {
+    const province = addressData.value.find(item => item.code === code);
+    if (province) {
+      form.value.addressProv = province.name;
+      // 直辖市特殊处理：市级选项与省级相同
+      if (municipalities.includes(province.name)) {
+        cityOptions.value = [{ code: province.code, name: province.name }];
+        cityCode.value = province.code;
+        form.value.addressCity = province.name;
+        // 直辖市的区县是省级的children
+        if (province.children && province.children.length > 0) {
+          countyOptions.value = province.children[0].children?.map(item => ({
+            code: item.code,
+            name: item.name
+          })) || [];
+        }
+      } else {
+        cityOptions.value = province.children?.map(item => ({
+          code: item.code,
+          name: item.name
+        })) || [];
+      }
+    }
+  }
+}
+
+// 市级变化处理
+function handleCityChange(code) {
+  countyCode.value = '';
+  townCode.value = '';
+  countyOptions.value = [];
+  townOptions.value = [];
+  form.value.addressCity = '';
+  form.value.addressCounty = '';
+  form.value.addressTown = '';
+
+  if (code) {
+    const province = addressData.value.find(item => item.code === provinceCode.value);
+    if (province) {
+      // 直辖市处理
+      if (municipalities.includes(province.name)) {
+        const county = province.children?.[0]?.children?.find(item => item.code === code);
+        if (county) {
+          form.value.addressCounty = county.name;
+          townOptions.value = county.children?.map(item => ({
+            code: item.code,
+            name: item.name
+          })) || [];
+        }
+      } else {
+        const city = province.children?.find(item => item.code === code);
+        if (city) {
+          form.value.addressCity = city.name;
+          countyOptions.value = city.children?.map(item => ({
+            code: item.code,
+            name: item.name
+          })) || [];
+        }
+      }
+    }
+  }
+}
+
+// 区县变化处理
+function handleCountyChange(code) {
+  townCode.value = '';
+  townOptions.value = [];
+  form.value.addressCounty = '';
+  form.value.addressTown = '';
+
+  if (code) {
+    const province = addressData.value.find(item => item.code === provinceCode.value);
+    if (province) {
+      if (municipalities.includes(province.name)) {
+        // 直辖市
+        const county = province.children?.[0]?.children?.find(item => item.code === code);
+        if (county) {
+          form.value.addressCounty = county.name;
+          townOptions.value = county.children?.map(item => ({
+            code: item.code,
+            name: item.name
+          })) || [];
+        }
+      } else {
+        const city = province.children?.find(item => item.code === cityCode.value);
+        if (city) {
+          const county = city.children?.find(item => item.code === code);
+          if (county) {
+            form.value.addressCounty = county.name;
+            townOptions.value = county.children?.map(item => ({
+              code: item.code,
+              name: item.name
+            })) || [];
+          }
+        }
+      }
+    }
+  }
+}
+
+// 街道变化处理
+function handleTownChange(code) {
+  form.value.addressTown = '';
+  if (code) {
+    const town = townOptions.value.find(item => item.code === code);
+    if (town) {
+      form.value.addressTown = town.name;
+    }
+  }
+}
 
 const form = ref({
   cardNo: '',
@@ -601,65 +758,104 @@ const form = ref({
   diagnosisId: '',
 });
 
-// 根据地址名称数组查找对应的代码数组（用于初始化地址选择器的回显）
-function findCodesByNames(names) {
-  const codes = [];
-  let currentNodes = addressOptions.value;
+// 根据地址名称初始化下拉选择器（用于回显）
+function initAddressByName(provName, cityName, countyName, townName) {
+  if (!provName) return;
 
-  for (const name of names) {
-    if (!name) break;
-    const node = currentNodes?.find(n => n.name === name);
-    if (node) {
-      codes.push(node.code);
-      currentNodes = node.children;
-    } else {
-      break;
-    }
-  }
-  return codes;
-}
+  // 初始化省级选项
+  initProvinceOptions();
 
-// 地址级联选择器变化处理
-function handleAddressChange(values) {
-  if (!values || values.length === 0) {
-    form.value.addressProv = '';
-    form.value.addressCity = '';
-    form.value.addressCounty = '';
-    form.value.addressTown = '';
-    return;
-  }
+  // 查找省份
+  const province = addressData.value.find(item => item.name === provName);
+  if (!province) return;
 
-  // 根据选中的代码获取对应的名称
-  const names = [];
-  let currentNodes = addressOptions.value;
+  provinceCode.value = province.code;
+  form.value.addressProv = province.name;
 
-  for (const code of values) {
-    const node = currentNodes?.find(n => n.code === code);
-    if (node) {
-      names.push(node.name);
-      currentNodes = node.children;
-    }
-  }
-
-  // 处理直辖市情况：如果是直辖市，市级和省级相同
-  const provName = names[0] || '';
-  let cityName = names[1] || '';
-  const countyName = names[2] || '';
-  const townName = names[3] || '';
-
-  // 如果是直辖市，市级应该与省级相同
+  // 直辖市处理
   if (municipalities.includes(provName)) {
-    // 直辖市：省级=市级
-    form.value.addressProv = provName;
-    form.value.addressCity = provName; // 直辖市的市级与省级相同
-    form.value.addressCounty = cityName; // 原来的市级变成区县
-    form.value.addressTown = countyName; // 原来的区县变成街道
+    cityOptions.value = [{ code: province.code, name: province.name }];
+    cityCode.value = province.code;
+    form.value.addressCity = province.name;
+
+    // 直辖市的区县
+    if (province.children && province.children.length > 0) {
+      countyOptions.value = province.children[0].children?.map(item => ({
+        code: item.code,
+        name: item.name
+      })) || [];
+
+      if (countyName) {
+        const county = countyOptions.value.find(item => item.name === countyName);
+        if (county) {
+          countyCode.value = county.code;
+          form.value.addressCounty = county.name;
+
+          // 获取原始区县数据以查找街道
+          const countyData = province.children[0].children?.find(item => item.code === county.code);
+          if (countyData && countyData.children) {
+            townOptions.value = countyData.children.map(item => ({
+              code: item.code,
+              name: item.name
+            }));
+
+            if (townName) {
+              const town = townOptions.value.find(item => item.name === townName);
+              if (town) {
+                townCode.value = town.code;
+                form.value.addressTown = town.name;
+              }
+            }
+          }
+        }
+      }
+    }
   } else {
-    // 非直辖市：正常处理
-    form.value.addressProv = provName;
-    form.value.addressCity = cityName;
-    form.value.addressCounty = countyName;
-    form.value.addressTown = townName;
+    // 非直辖市处理
+    cityOptions.value = province.children?.map(item => ({
+      code: item.code,
+      name: item.name
+    })) || [];
+
+    if (cityName) {
+      const city = cityOptions.value.find(item => item.name === cityName);
+      if (city) {
+        cityCode.value = city.code;
+        form.value.addressCity = city.name;
+
+        const cityData = province.children?.find(item => item.code === city.code);
+        if (cityData && cityData.children) {
+          countyOptions.value = cityData.children.map(item => ({
+            code: item.code,
+            name: item.name
+          }));
+
+          if (countyName) {
+            const county = countyOptions.value.find(item => item.name === countyName);
+            if (county) {
+              countyCode.value = county.code;
+              form.value.addressCounty = county.name;
+
+              const countyData = cityData.children.find(item => item.code === county.code);
+              if (countyData && countyData.children) {
+                townOptions.value = countyData.children.map(item => ({
+                  code: item.code,
+                  name: item.name
+                }));
+
+                if (townName) {
+                  const town = townOptions.value.find(item => item.name === townName);
+                  if (town) {
+                    townCode.value = town.code;
+                    form.value.addressTown = town.name;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
 }
 
@@ -716,7 +912,7 @@ const currentSubtypeOptions = computed(() => {
   if (!form.value.selectedClassA && !form.value.selectedClassB && !form.value.selectedClassC) {
     return [];
   }
-  
+
   // 优先使用甲类或乙类疾病（因为它们是单选）
   const selectedDisease = form.value.selectedClassA || form.value.selectedClassB || form.value.selectedClassC;
   return diseaseSubtypeMap[selectedDisease] || [];
@@ -821,23 +1017,23 @@ function parseBirthDate(birthDate) {
  */
 function parseIdCardInfo(idNo) {
   if (!idNo) return null;
-  
+
   // 标准化处理：去除空格，大写X
   idNo = idNo.trim().toUpperCase();
-  
+
   // 18位身份证
   if (idNo.length === 18) {
     const birthYear = idNo.substring(6, 10);
     const birthMonth = idNo.substring(10, 12);
     const birthDay = idNo.substring(12, 14);
     const genderCode = idNo.substring(16, 17);
-    
+
     // 验证日期有效性
     const birthDate = new Date(parseInt(birthYear), parseInt(birthMonth) - 1, parseInt(birthDay));
     if (isNaN(birthDate.getTime())) {
       return null;
     }
-    
+
     return {
       birthYear,
       birthMonth,
@@ -846,20 +1042,20 @@ function parseIdCardInfo(idNo) {
       birthDate: `${birthYear}-${birthMonth}-${birthDay}`
     };
   }
-  
+
   // 15位身份证（老版）
   if (idNo.length === 15) {
     const birthYear = '19' + idNo.substring(6, 8);
     const birthMonth = idNo.substring(8, 10);
     const birthDay = idNo.substring(10, 12);
     const genderCode = idNo.substring(13, 14);
-    
+
     // 验证日期有效性
     const birthDate = new Date(parseInt(birthYear), parseInt(birthMonth) - 1, parseInt(birthDay));
     if (isNaN(birthDate.getTime())) {
       return null;
     }
-    
+
     return {
       birthYear,
       birthMonth,
@@ -868,7 +1064,7 @@ function parseIdCardInfo(idNo) {
       birthDate: `${birthYear}-${birthMonth}-${birthDay}`
     };
   }
-  
+
   return null;
 }
 
@@ -877,17 +1073,17 @@ function parseIdCardInfo(idNo) {
  */
 function handleIdCardChange(value) {
   if (!value) return;
-  
+
   const info = parseIdCardInfo(value);
   if (info) {
     // 自动填充出生日期
     form.value.birthYear = info.birthYear;
     form.value.birthMonth = info.birthMonth;
     form.value.birthDay = info.birthDay;
-    
+
     // 自动填充性别
     form.value.sex = info.sex;
-    
+
     // 计算年龄
     calculateAge();
   }
@@ -920,6 +1116,19 @@ function calculateAge() {
  */
 function show(diagnosisData) {
   dialogVisible.value = true;
+
+  // 重置地址选择器状态
+  provinceCode.value = '';
+  cityCode.value = '';
+  countyCode.value = '';
+  townCode.value = '';
+  cityOptions.value = [];
+  countyOptions.value = [];
+  townOptions.value = [];
+
+  // 初始化省级地址选项
+  initProvinceOptions();
+
   const patientInfo = props.patientInfo || {};
   const birthInfo = parseBirthDate(patientInfo.birthDate || patientInfo.birthday);
 
@@ -947,27 +1156,27 @@ function show(diagnosisData) {
   form.value = {
     // 卡片编号：单位自编，与网络直报一致
     cardNo: '',
-    
+
     // 患者基本信息
     patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名
     parentName: '', // 家长姓名（14岁以下患者必填）
     idNo: patientInfo.idCard, // 身份证号
     sex: patientInfo.sex || patientInfo.genderName || '男', // 性别
-    
+
     // 出生日期信息
     birthYear: birthInfo.year, // 出生年份
     birthMonth: birthInfo.month, // 出生月份
     birthDay: birthInfo.day, // 出生日期
     age: patientInfo.age || '', // 实足年龄
     ageUnit: '岁', // 年龄单位（岁/月/天）
-    
+
     // 工作单位信息
     workplace: patientInfo.workplace || '', // 工作单位（学校）
-    
+
     // 联系方式
     phone: patientInfo.phone || patientInfo.mobile || '', // 联系电话
     contactPhone: '', // 紧急联系人电话
-    
+
     // 现住地址信息（省市区街道）
     addressProv: diagnosisData?.addressProv || '', // 省份
     addressCity: diagnosisData?.addressCity || '', // 城市
@@ -975,40 +1184,40 @@ function show(diagnosisData) {
     addressTown: diagnosisData?.addressTown || '', // 街道
     addressVillage: diagnosisData?.addressVillage || '', // 乡镇/村
     addressHouse: diagnosisData?.addressHouse || '', // 门牌号
-    
+
     // 患者类型和职业
     patientBelong: '1', // 患者属于（本县区/本市其他县区/本省其他地市/外省/港澳台/外籍）
     occupation: '', // 职业
     caseClass: '', // 病例分类（疑似病例/临床诊断病例/确诊病例/病原携带者/阳性检测）
-    
+
     // 疾病相关日期
     onsetDate: getCurrentDate(), // 发病日期
     diagDate: getCurrentDate(), // 诊断日期
     deathDate: '', // 死亡日期（如死亡）
-    
+
     // 疾病选择信息
     selectedDiseases: [], // 已选疾病列表
     selectedClassA: selectedClassA, // 甲类传染病选择
     selectedClassB: selectedClassB, // 乙类传染病选择
     selectedClassC: selectedClassC, // 丙类传染病选择
-    
+
     // 其他传染病信息
     otherDisease: '', // 其他法定管理以及重点监测传染病
     diseaseType: '', // 疾病分型（如病毒性肝炎分型、肺结核分型等）
-    
+
     // 报告单位信息
     reportOrg: userStore.fixmedinsCode || '', // 报告单位（统一社会信用代码/组织机构代码）
     reportOrgPhone: '', // 报告单位联系电话
     reportDoc: userStore.nickName || userStore.name || '', // 报告医生
     reportDate: getCurrentDate(), // 报告日期
-    
+
     // 订正信息
     correctName: '', // 订正病名
     withdrawReason: '', // 退回原因
-    
+
     // 备注信息
     remark: '', // 备注
-    
+
     // 系统关联信息
     encounterId: patientInfo.encounterId || '', // 就诊ID
     patientId: patientInfo.patientId || '', // 患者ID
@@ -1019,37 +1228,16 @@ function show(diagnosisData) {
   updateSelectedDiseases();
 
   // 设置地址选择组件初始值
-  // 根据地址名称查找对应的代码数组
   const provName = diagnosisData?.addressProv || '';
-  let cityName = diagnosisData?.addressCity || '';
+  const cityName = diagnosisData?.addressCity || '';
   const countyName = diagnosisData?.addressCounty || '';
   const townName = diagnosisData?.addressTown || '';
 
-  // 处理直辖市情况：如果是直辖市，需要调整地址层级
-  let names = [];
-  if (municipalities.includes(provName)) {
-    // 直辖市：省级=市级，所以传给级联选择器的应该是 [省, 区县, 街道]
-    names = [provName, countyName, townName].filter(n => n);
-  } else {
-    // 非直辖市：正常处理 [省, 市, 区县, 街道]
-    names = [provName, cityName, countyName, townName].filter(n => n);
-  }
-  addressCodes.value = findCodesByNames(names);
+  initAddressByName(provName, cityName, countyName, townName);
 
   if (birthInfo.year) {
     calculateAge();
   }
-
-  // 从后端获取下一个卡片编号（含流水号）
-  getNextCardNo(orgCode).then(res => {
-    if (res.code === 200 && res.data) {
-      form.value.cardNo = res.data;
-    }
-  }).catch(err => {
-    // 后端不可用时提示用户，不生成可能重复的编号
-    proxy.$modal.msgError('获取卡片编号失败，请稍后重试');
-    console.error('获取卡片编号失败:', err);
-  });
 }
 
 /**
@@ -1096,8 +1284,8 @@ async function buildSubmitData() {
     parentName: formData.parentName || null,
     sex: formData.sex === '男' ? '1' : formData.sex === '女' ? '2' : '0',
     birthday: formData.birthYear && formData.birthMonth && formData.birthDay
-      ? `${formData.birthYear}-${formData.birthMonth}-${formData.birthDay}`
-      : null,
+        ? `${formData.birthYear}-${formData.birthMonth}-${formData.birthDay}`
+        : null,
     age: formData.age ? parseInt(formData.age) : null,
     ageUnit: ageUnitMap[formData.ageUnit] || '1',
     workplace: formData.workplace || null,
@@ -1141,6 +1329,11 @@ async function buildSubmitData() {
 function validateFormManually() {
   const errors = [];
 
+  // 卡片编号验证（可选，但如果填写了必须是12位）
+  if (form.value.cardNo && form.value.cardNo.length !== 12) {
+    errors.push('卡片编号必须为12位');
+  }
+
   // 身份证号验证
   if (!form.value.idNo) {
     errors.push('请输入身份证号');
@@ -1356,6 +1549,26 @@ defineExpose({ show });
 
 .card-number-input {
   width: 240px;
+
+  :deep(.el-input__wrapper) {
+    border: none;
+    border-bottom: 1px solid #dcdfe6;
+    border-radius: 0;
+    box-shadow: none;
+    background: transparent;
+  }
+
+  :deep(.el-input__inner) {
+    font-size: 12px;
+    color: #666;
+    text-align: center;
+    letter-spacing: 2px;
+  }
+
+  :deep(.el-input__inner::placeholder) {
+    font-size: 12px;
+    color: #999;
+  }
 }
 
 /* 表单区域样式 */
@@ -1414,36 +1627,90 @@ defineExpose({ show });
   gap: 4px;
 }
 
-/* 地址选择样式 */
-.address-inputs {
+/* 地址选择样式 - 四个下拉框并排 */
+.address-selects {
   display: flex;
   gap: 8px;
-  flex-wrap: wrap;
-}
-
-/* 地址级联选择器样式 */
-.region-selects-wrapper {
   flex: 1;
 }
 
-.region-selects-wrapper :deep(.el-cascader) {
-  width: 100%;
+.address-selects .el-select {
+  flex: 1;
+  min-width: 0;
 }
 
-.region-selects-wrapper :deep(.el-cascader .el-input__wrapper) {
+.address-selects :deep(.el-input__wrapper) {
+  border: none;
   border-bottom: 1px solid #dcdfe6;
   border-radius: 0;
   box-shadow: none;
+  background: transparent;
 }
 
-.region-selects-wrapper :deep(.el-cascader .el-input__wrapper:hover) {
+.address-selects :deep(.el-input__wrapper:hover) {
   border-bottom-color: #c0c4cc;
 }
 
-.region-selects-wrapper :deep(.el-cascader .el-input__wrapper.is-focus) {
+.address-selects :deep(.el-input__wrapper.is-focus) {
   border-bottom-color: #409eff;
 }
 
+.address-selects :deep(.el-input__inner) {
+  font-size: 12px;
+  color: #666;
+}
+
+.address-selects :deep(.el-input__inner::placeholder) {
+  font-size: 12px;
+  color: #999;
+}
+
+/* 街道下拉框下划线样式 */
+.underline-select {
+  width: 100%;
+}
+
+.underline-select :deep(.el-input__wrapper) {
+  border: none;
+  border-bottom: 1px solid #dcdfe6;
+  border-radius: 0;
+  box-shadow: none;
+  background: transparent;
+}
+
+.underline-select :deep(.el-input__wrapper:hover) {
+  border-bottom-color: #c0c4cc;
+}
+
+.underline-select :deep(.el-input__wrapper.is-focus) {
+  border-bottom-color: #409eff;
+}
+
+.underline-select :deep(.el-input__inner) {
+  font-size: 12px;
+  color: #666;
+}
+
+.underline-select :deep(.el-input__inner::placeholder) {
+  font-size: 12px;
+  color: #999;
+}
+
+/* 病例分类两行排布 */
+.case-class-group {
+  width: 100%;
+}
+
+.case-class-row {
+  display: flex;
+  gap: 16px;
+  margin-bottom: 8px;
+}
+
+.case-class-row:last-child {
+  margin-bottom: 0;
+}
+
 
 .full-select {
   width: 100%;
@@ -1502,6 +1769,10 @@ defineExpose({ show });
   width: calc(25% - 8px);
 }
 
+.disease-list.four-columns .el-checkbox.wide-checkbox {
+  width: calc(50% - 8px);
+}
+
 .disease-with-subtype {
   display: flex;
   align-items: center;
@@ -1533,6 +1804,9 @@ defineExpose({ show });
   .disease-with-subtype {
     width: calc(50% - 8px);
   }
+  .disease-list.four-columns .el-checkbox.wide-checkbox {
+    width: 100%;
+  }
 }
 
 @media (max-width: 600px) {