提交merge1.3

openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue

@@ -12,6 +12,16 @@
             width="100"
           />
           <el-table-column label="门诊号" align="center" prop="iptOtpNo" />
+          <el-table-column label="患者姓名" align="center" prop="patnName" />
+          <el-table-column label="身份证号" align="center" prop="certno" />
+          <el-table-column label="诊断名" align="center" prop="conditionName" />
+          <el-table-column
+            label="慢性诊断名"
+            align="center"
+            prop="specialConditionName"
+            width="180"
+          />
+
           <el-table-column label="请求数量" align="center" prop="quantity" />
           <el-table-column label="请求单位" align="center" prop="unitCode" />
           <el-table-column label="审核状态" align="center" prop="statusEnum_enumText" />
@@ -38,8 +48,7 @@
           <el-table-column label="给药间隔" align="center" prop="dispenseInterval" />
           <el-table-column label="单次发药数" align="center" prop="dispensePerQuantity" />
           <el-table-column label="每次发药供应天数" align="center" prop="dispensePerDuration" />
-          <el-table-column label="患者姓名" align="center" prop="patnName" />
-          <el-table-column label="身份证号" align="center" prop="certno" />
+
           <el-table-column label="开方医生名" align="center" prop="practitionerName" />
           <el-table-column label="挂号科室" align="center" prop="mdtrtDeptName" />
           <el-table-column label="开单科室" align="center" prop="prscDeptName" />
@@ -53,7 +62,6 @@
               {{ formatDate(scope.row.prscTime) }}
             </template>
           </el-table-column>
-          <el-table-column label="诊断名" align="center" prop="conditionName" />
         </el-table>
         <!-- <pagination
           v-show="total > 0"