diff --git a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
index 0f3d2fe2..5554a0c5 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
@@ -258,7 +258,6 @@ const selectedItems = ref(new Set());
 
 const tableRef = ref(null);
 const selectedGroupIds = ref(new Set());
-const selectedPrescriptionNos = ref(new Set());
 
 const currentRow = ref(null);
 const dateRange = ref([]);
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
index d09af0a2..c6d6c34a 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
@@ -1,199 +1,348 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-		   <el-form-item label="门诊号" prop="encounterBusNo">
-		      <el-input v-model="queryParams.encounterBusNo"  placeholder="请输入门诊号" clearable style="width: 210px"
-		         @keyup.enter="handleQuery" />
-		   </el-form-item>
-		   <el-form-item label="处方号" prop="prescriptionNo">
-		      <el-input v-model="queryParams.prescriptionNo"  placeholder="请输入处方号" clearable style="width: 200px"
-		         @keyup.enter="handleQuery" />
-		   </el-form-item>
-           <el-form-item label="病人ID" prop="patientBusNo">
-		      <el-input v-model="queryParams.patientBusNo"  placeholder="请输入病人ID" clearable style="width: 200px"
-		         @keyup.enter="handleQuery" />
-		   </el-form-item>
-           <el-form-item label="电话" prop="phone">
-		      <el-input v-model="queryParams.phone"  placeholder="请输入电话" clearable style="width: 200px"
-		         @keyup.enter="handleQuery" />
-		   </el-form-item>
-           <el-form-item label="查询时间" >
-            <el-date-picker v-model="dateRange"  value-format="YYYY-MM-DD" type="daterange" range-separator="-" 
-            start-placeholder="开始日期" end-placeholder="结束日期" ></el-date-picker>
-		   </el-form-item>
-		   <el-form-item label="皮试项目状态" prop="status">
-				<el-select v-model="queryParams.status" placeholder="请选择状态" clearable   @keyup.enter="handleQuery" style="width: 160px">
-					<el-option v-for="item in statusList"
-					:key="item.value" :label="item.info" :value="item.value" />
-				</el-select>
-		   </el-form-item>
-		   <el-form-item>
-		      <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-		      <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-		   </el-form-item>
-		</el-form>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-form-item label="门诊号" prop="encounterBusNo">
+        <el-input
+          v-model="queryParams.encounterBusNo"
+          placeholder="请输入门诊号"
+          clearable
+          style="width: 210px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处方号" prop="prescriptionNo">
+        <el-input
+          v-model="queryParams.prescriptionNo"
+          placeholder="请输入处方号"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="病人ID" prop="patientBusNo">
+        <el-input
+          v-model="queryParams.patientBusNo"
+          placeholder="请输入病人ID"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入电话"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="查询时间">
+        <el-date-picker
+          v-model="dateRange"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="皮试项目状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          @keyup.enter="handleQuery"
+          style="width: 160px"
+        >
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.info"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-table :data="skinRecordList" border style="width: 100%">
-		    <el-table-column prop="prescriptionNo" label="处方号" width="150" />
-		    <el-table-column prop="encounterBusNo" label="门诊号" width="150" />
-		    <el-table-column prop="patientBusNo" label="病人ID" width="150" />
-			<el-table-column prop="patientName" label="病人" width="120" />
-			<el-table-column label="发药状态" width="180">
-				<template #default="scope">
-					<span :class="getStatusColor(scope.row.medicationStatusEnum_enumText)">
-					{{ scope.row.medicationStatusEnum_enumText }}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="medicationInformation" label="药品信息" width="150" />
-			<el-table-column prop="medicationDetail" label="药品" width="160" />
-			<el-table-column prop="medicationLotNumber" label="药品批号" width="160" />
-			<el-table-column prop="verificationStatusEnum_enumText" label="状态" width="80" />
-			<el-table-column prop="clinicalStatusEnum_enumText" label="皮试结果" width="120" >
-				<template #default="scope">
-					<span :class="getClinicalStatus(scope.row.clinicalStatusEnum_enumText)">
-					{{ scope.row.clinicalStatusEnum_enumText }}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="performerId_dictText" label="执行护士" width="130" />
-			<el-table-column prop="performerCheckId_dictText" label="核对护士" width="130" />
-		    <el-table-column prop="occurrenceStartTime" key="occurrenceStartTime" label="开始时间" width="180" >
-				<template #default="scope">
-                <span>{{ parseTime(scope.row.occurrenceStartTime) }}</span>
-              </template>
-			</el-table-column>
-			<el-table-column prop="occurrenceEndTime" key="occurrenceEndTime" label="结束时间" width="180">
-				<template #default="scope">
-                <span>{{ parseTime(scope.row.occurrenceEndTime) }}</span>
-              </template>
-			</el-table-column>
-			<el-table-column prop="doctorId_dictText" label="开单医生" width="180" />
-			<el-table-column prop="note" label="备注" width="180" />
-            <el-table-column label="操作" align="center" width="210" fixed="right" class-name="small-padding fixed-width">
-			   <template #default="scope">
-			      <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" 
-				  :disabled="!!scope.row.performerCheckId_dictText ">修改</el-button>
-			      <el-button link type="primary" icon="EditPen" @click="sign(scope.row)" 
-				  :disabled="!!scope.row.performerCheckId_dictText || scope.row.medicationStatusEnum_enumText == '未完成'">签名</el-button>
-			      <!-- <el-button link type="primary" icon="Finished" @click="submitForm(scope.row)" v-hasPermi="['system:menu:add']">保存</el-button> -->
-			   </template>
-			</el-table-column>
-		  </el-table>
-		  <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-		<el-dialog title="查看" v-model="open" width="900px" append-to-body>
-			<el-form ref="skinRecordRef" :model="form" :rules="rules" label-width="100px">
-				<el-row>
-					<el-col :span="7">
-						<el-form-item label="处方号" prop="prescriptionNo">
-					  		<el-input v-model="form.prescriptionNo" disabled/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="7">
-						<el-form-item label="门诊号" prop="encounterBusNo">
-					  		<el-input v-model="form.encounterBusNo" disabled/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="7">
-						<el-form-item label="病人" prop="patientName">
-					  		<el-input v-model="form.patientName"  disabled/>
-					  	</el-form-item>
-					</el-col>
-				</el-row><br>
-				<el-row>
-					<el-col :span="8">
-						<el-form-item label="药品信息" prop="medicationInformation">
-					  		<el-input v-model="form.medicationInformation" clearable  disabled/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="10">
-						<el-form-item label="药品" prop="medicationDetail">
-					  		<el-input v-model="form.medicationDetail"  disabled/>
-					  	</el-form-item>
-					</el-col>
-				</el-row><br>
-				<el-row>
-					<el-col :span="7">
-						<el-form-item label="药品批号" prop="medicationLotNumber">
-					  		<el-input v-model="form.medicationLotNumber" disabled/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="状态" prop="verificationStatusEnum">
-							<el-select v-model="form.verificationStatusEnum" placeholder="请选择状态" clearable >
-						      <el-option v-for="item in statusList"
-						         :key="item.value" :label="item.info" :value="item.value" />
-						   </el-select>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="7">
-						<el-form-item label="皮试结果" prop="clinicalStatusEnum">
-							<el-select v-model="form.clinicalStatusEnum" placeholder="请选择皮试结果" clearable :disabled="isViewMode">
-						      <el-option v-for="item in skinResultList"
-						         :key="item.value" :label="item.info" :value="item.value" />
-						   </el-select>
-					  	</el-form-item>
-					</el-col>
-				</el-row><br>
-				<el-row>
-					<el-col :span="7">
-						<el-form-item label="执行护士" prop="performerId_dictText">
-					  		<el-input v-model="form.performerId_dictText"  disabled/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="7">
-						<el-form-item label="核对护士" prop="performerCheckId_dictText">
-					  		<el-input v-model="form.performerCheckId_dictText"  disabled/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="7">
-						<el-form-item label="开单医生" prop="name">
-					  		<el-input v-model="form.name"  disabled/>
-					  	</el-form-item>
-					</el-col>
-				</el-row><br>
-				<el-row>
-					<el-col :span="8">
-						<el-form-item label="开始时间" prop="occurrenceStartTime">
-							<el-date-picker v-model="form.occurrenceStartTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="开始时间" :default-time="defaultTime"/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item label="结束时间" prop="occurrenceEndTime">
-							<el-date-picker v-model="form.occurrenceEndTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="结束时间" :default-time="defaultTime"/>
-					  	</el-form-item>
-					</el-col>
-				</el-row><br>
-				<el-row>
-					<el-col :span="7">
-						<el-form-item label="发药状态" prop="medicationStatusEnum">
-							<el-input v-model="form.medicationStatusEnum"  disabled/>
-					  	</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="备注" prop="note">
-							<el-input v-model="form.note" clearable />
-					  	</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="saveForm">确认项目</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-		</el-dialog>
-	
-	
-	</div>
+    <el-table :data="skinRecordList" border style="width: 100%">
+      <el-table-column prop="prescriptionNo" label="处方号" width="150" />
+      <el-table-column prop="encounterBusNo" label="门诊号" width="150" />
+      <el-table-column prop="patientBusNo" label="病人ID" width="150" />
+      <el-table-column prop="patientName" label="病人" width="120" />
+      <el-table-column label="发药状态" width="180">
+        <template #default="scope">
+          <span
+            :class="getStatusColor(scope.row.medicationStatusEnum_enumText)"
+          >
+            {{ scope.row.medicationStatusEnum_enumText }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="medicationInformation"
+        label="药品信息"
+        width="150"
+      />
+      <el-table-column prop="medicationDetail" label="药品" width="160" />
+      <el-table-column
+        prop="medicationLotNumber"
+        label="药品批号"
+        width="160"
+      />
+      <el-table-column
+        prop="verificationStatusEnum_enumText"
+        label="状态"
+        width="80"
+      />
+      <el-table-column
+        prop="clinicalStatusEnum_enumText"
+        label="皮试结果"
+        width="120"
+      >
+        <template #default="scope">
+          <span
+            :class="getClinicalStatus(scope.row.clinicalStatusEnum_enumText)"
+          >
+            {{ scope.row.clinicalStatusEnum_enumText }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="performerId_dictText"
+        label="执行护士"
+        width="130"
+      />
+      <el-table-column
+        prop="performerCheckId_dictText"
+        label="核对护士"
+        width="130"
+      />
+      <el-table-column
+        prop="occurrenceStartTime"
+        key="occurrenceStartTime"
+        label="开始时间"
+        width="180"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.occurrenceStartTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="occurrenceEndTime"
+        key="occurrenceEndTime"
+        label="结束时间"
+        width="180"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.occurrenceEndTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="doctorId_dictText" label="开单医生" width="180" />
+      <el-table-column prop="note" label="备注" width="180" />
+      <el-table-column
+        label="操作"
+        align="center"
+        width="210"
+        fixed="right"
+        class-name="small-padding fixed-width"
+      >
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            :disabled="!!scope.row.performerCheckId_dictText"
+            >修改</el-button
+          >
+          <el-button
+            link
+            type="primary"
+            icon="EditPen"
+            @click="sign(scope.row)"
+            :disabled="
+              !!scope.row.performerCheckId_dictText ||
+              scope.row.medicationStatusEnum_enumText == '未完成'
+            "
+            >签名</el-button
+          >
+          <!-- <el-button link type="primary" icon="Finished" @click="submitForm(scope.row)" v-hasPermi="['system:menu:add']">保存</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <el-dialog title="查看" v-model="open" width="900px" append-to-body>
+      <el-form
+        ref="skinRecordRef"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="处方号" prop="prescriptionNo">
+              <el-input v-model="form.prescriptionNo" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="门诊号" prop="encounterBusNo">
+              <el-input v-model="form.encounterBusNo" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="病人" prop="patientName">
+              <el-input v-model="form.patientName" disabled />
+            </el-form-item>
+          </el-col> </el-row
+        ><br />
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="药品信息" prop="medicationInformation">
+              <el-input
+                v-model="form.medicationInformation"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="药品" prop="medicationDetail">
+              <el-input v-model="form.medicationDetail" disabled />
+            </el-form-item>
+          </el-col> </el-row
+        ><br />
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="药品批号" prop="medicationLotNumber">
+              <el-input v-model="form.medicationLotNumber" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="状态" prop="verificationStatusEnum">
+              <el-select
+                v-model="form.verificationStatusEnum"
+                placeholder="请选择状态"
+                clearable
+              >
+                <el-option
+                  v-for="item in statusList"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="皮试结果" prop="clinicalStatusEnum">
+              <el-select
+                v-model="form.clinicalStatusEnum"
+                placeholder="请选择皮试结果"
+                clearable
+                :disabled="isViewMode"
+              >
+                <el-option
+                  v-for="item in skinResultList"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col> </el-row
+        ><br />
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="执行护士" prop="performerId_dictText">
+              <el-input v-model="form.performerId_dictText" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="核对护士" prop="performerCheckId_dictText">
+              <el-input v-model="form.performerCheckId_dictText" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="开单医生" prop="name">
+              <el-input v-model="form.name" disabled />
+            </el-form-item>
+          </el-col> </el-row
+        ><br />
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="开始时间" prop="occurrenceStartTime">
+              <el-date-picker
+                v-model="form.occurrenceStartTime"
+                type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始时间"
+                :default-time="defaultTime"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结束时间" prop="occurrenceEndTime">
+              <el-date-picker
+                v-model="form.occurrenceEndTime"
+                type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束时间"
+                :default-time="defaultTime"
+              />
+            </el-form-item>
+          </el-col> </el-row
+        ><br />
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="发药状态" prop="medicationStatusEnum">
+              <el-input v-model="form.medicationStatusEnum" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="note">
+              <el-input v-model="form.note" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="saveForm">确认项目</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script  setup name="skinRecord">
-import { ref, computed } from 'vue';
-import { ElMessage,ElMessageBox  } from 'element-plus'
+import { ref, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
 
-import { listSkinRecord,updateNurseSign,updateSkinTestRecord,lists } from './component/api'; 
+import {
+  listSkinRecord,
+  updateNurseSign,
+  updateSkinTestRecord,
+  lists,
+} from "./component/api";
 
 const showSearch = ref(true);
 const total = ref(1);
@@ -205,75 +354,74 @@ const statusList = ref([]);
 const open = ref(false);
 
 const getStatusColor = (status) => {
-  return status !== '已完成' ? 'status-red' : '';
+  return status !== "已完成" ? "status-red" : "";
 };
 
 const getClinicalStatus = (status) => {
-  return status === '阳性' ? 'status-red' : '';
+  return status === "阳性" ? "status-red" : "";
 };
 
-
 const { proxy } = getCurrentInstance();
 
 const data = reactive({
   form: {},
   queryParams: {
-	pageNo: 1,
+    pageNo: 1,
     pageSize: 10,
     encounterBusNo: undefined,
     prescriptionNo: undefined,
     patientBusNo: undefined,
     phone: undefined,
-    status: undefined
+    status: undefined,
   },
 });
-const { queryParams,form } = toRefs(data);
+const { queryParams, form } = toRefs(data);
 /** 表单重置 */
 function reset() {
   form.value = {
     prescriptionNo: 0,
     encounterBusNo: undefined,
-	patientName: undefined,
-	medicationInformation: undefined,
+    patientName: undefined,
+    medicationInformation: undefined,
     medicationDetail: undefined,
     medicationLotNumber: undefined,
     status: undefined,
     clinicalStatusEnum: 0,
     performerId_dictText: undefined,
-	performerCheckId_dictText: undefined,
-	occurrenceStartTime: undefined,
-	occurrenceEndTime: undefined,
-	medicationStatusEnum: undefined,
-	note: undefined,
+    performerCheckId_dictText: undefined,
+    occurrenceStartTime: undefined,
+    occurrenceEndTime: undefined,
+    medicationStatusEnum: undefined,
+    note: undefined,
   };
   proxy.resetForm("skinRecordRef");
 }
 
 /** 查询门诊皮试列表 */
 function getList() {
-  listSkinRecord(queryParams.value).then(response => {
-	console.log("12346999999");
+  listSkinRecord(queryParams.value).then((response) => {
+    console.log("12346999999");
     skinRecordList.value = response.data.records;
     total.value = response.data.total;
   });
-  lists().then(response => {
-	console.log("1234",response);
-	skinResultList.value = response.data.verificationStatus
-	statusList.value = response.data.clinicalStatus
+  lists().then((response) => {
+    console.log("1234", response);
+    skinResultList.value = response.data.verificationStatus;
+    statusList.value = response.data.clinicalStatus;
   });
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-	queryParams.value.beginTime = dateRange.value[0];
-	queryParams.value.endTime = dateRange.value[1];
+  queryParams.value.beginTime = dateRange.value[0];
+  queryParams.value.endTime = dateRange.value[1];
   queryParams.value.pageNo = 1;
-  console.log("123",queryParams.value,typeof queryParams.value.beginTime)
+  console.log("123", queryParams.value, typeof queryParams.value.beginTime);
   getList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
-	dateRange.value = [];
+  dateRange.value = [];
   proxy.resetForm("queryRef");
   handleQuery();
 }
@@ -283,77 +431,67 @@ function cancel() {
   reset();
 }
 function handleUpdate(row) {
-	if (row.medicationStatusEnum_enumText === '已完成') {
+  if (row.medicationStatusEnum_enumText === "已完成") {
     // 如果状态是“已完成”，允许编辑
     reset();
     open.value = true;
     form.value = row;
   } else {
     // 如果状态不是“已完成”，提示用户
-	ElMessageBox.alert('请先领药', '提示', {
-      type: 'error',
-      center: true // 确保对话框居中
+    ElMessageBox.alert("请先领药", "提示", {
+      type: "error",
+      center: true, // 确保对话框居中
     });
   }
 }
-function sign(row){
-	console.log("564564",row);
-	proxy.$modal.confirm('签字后无法修改信息').then(() => {
-	updateNurseSign(row).then(response => {
-		proxy.$modal.msgSuccess("签名成功");
-		open.value = false;
-		getList();
-	}).catch(error => {
-		// 处理签名失败的逻辑
-		proxy.$modal.msgError("签名失败：" + error.message);
-	});
-	}).catch(() => {});
+function sign(row) {
+  console.log("564564", row);
+  proxy.$modal
+    .confirm("签字后无法修改信息")
+    .then(() => {
+      updateNurseSign(row)
+        .then((response) => {
+          proxy.$modal.msgSuccess("签名成功");
+          open.value = false;
+          getList();
+        })
+        .catch((error) => {
+          // 处理签名失败的逻辑
+          proxy.$modal.msgError("签名失败：" + error.message);
+        });
+    })
+    .catch(() => {});
 }
 
 function saveForm() {
-	if (form.value.startTime > form.value.endTime) {
-		ElMessage({
-		message: '开始时间不能大于结束时间',
-		type: 'error',
-		})
-	}else{
-		// const index = skinRecordList.value.findIndex(item => item.id === form.id);
-		// const statusInfo = statusList.value.find(item => item.value === form.value.verificationStatusEnum)?.info || '';
-		// const clinicalStatusInfo = skinResultList.value.find(item => item.value === form.value.clinicalStatusEnum)?.info || '';
-		// if (index !== -1) {
-		// 	//暂存数据
-		// 	skinRecordList.value[index].verificationStatusEnum_enumText = statusInfo;
-		// 	skinRecordList.value[index].clinicalStatusEnum_enumText = clinicalStatusInfo;
-		// 	skinRecordList.value[index].occurrenceStartTime = form.occurrenceStartTime;
-		// 	skinRecordList.value[index].occurrenceEndTime = form.occurrenceEndTime;
-		// 	skinRecordList.value[index].note = form.note;
-		// 	console.log(skinRecordList.value[index]);
-		// }
-		console.log("564564",form.value);
-		// return;
-		updateSkinTestRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("更新成功");
-          open.value = false;
-          getList();
-        });
-		open.value = false;
-	} 
+  if (form.value.startTime > form.value.endTime) {
+    ElMessage({
+      message: "开始时间不能大于结束时间",
+      type: "error",
+    });
+  } else {
+    updateSkinTestRecord(form.value).then((response) => {
+      proxy.$modal.msgSuccess("更新成功");
+      open.value = false;
+      getList();
+    });
+    open.value = false;
+  }
 }
 
-function submitForm() {
-  proxy.$refs["patientRef"].validate(valid => {
-    if (valid) {
-        updateSkinTestRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("更新成功");
-          open.value = false;
-          getList();
-        });
-    }
-  });
-}
+// function submitForm() {
+//   proxy.$refs["patientRef"].validate((valid) => {
+//     if (valid) {
+//       updateSkinTestRecord(form.value).then((response) => {
+//         proxy.$modal.msgSuccess("更新成功");
+//         open.value = false;
+//         getList();
+//       });
+//     }
+//   });
+// }
 
 getList();
-
 </script>
 
 <style scoped>
diff --git a/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue b/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
index f08a5473..89363c26 100644
--- a/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
@@ -1,55 +1,93 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-			<el-form-item label="查询内容" prop="searchKey">
-				<el-input v-model="queryParams.searchKey" placeholder="身份证号/病人ID/门诊号/姓名" clearable style="width: 210px"
-					@keyup.enter="handleQuery" />
-			</el-form-item>
-			<el-form-item label="电话" prop="phone">
-				<el-input v-model="queryParams.phone" placeholder="请输入联系方式" clearable style="width: 200px"
-					@keyup.enter="handleQuery" />
-			</el-form-item>
-			<el-form-item label="起始时间">
-				<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-					start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-			</el-form-item>
-			<el-form-item label="医生" prop="doctorName">
-				<el-select v-model="queryParams.doctorName" placeholder="请选择医生" clearable @keyup.enter="handleQuery"
-					style="width: 160px">
-					<el-option v-for="item in doctorOptions" :key="item.value" :label="item.label"
-						:value="item.label" />
-				</el-select>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-				<el-button icon="Refresh" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-form-item label="查询内容" prop="searchKey">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="身份证号/病人ID/门诊号/姓名"
+          clearable
+          style="width: 210px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系方式"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="起始时间">
+        <el-date-picker
+          v-model="dateRange"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="医生" prop="doctorName">
+        <el-select
+          v-model="queryParams.doctorName"
+          placeholder="请选择医生"
+          clearable
+          @keyup.enter="handleQuery"
+          style="width: 160px"
+        >
+          <el-option
+            v-for="item in doctorOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.label"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-		<el-table :data="outpatienRecordsList" border style="width: 100%">
-			<el-table-column prop="name" label="患者" width="180" />
-			<el-table-column prop="idCard" label="身份证" width="180" />
-			<el-table-column prop="description" label="疾病" width="180" />
-			<el-table-column prop="patientBusNo" label="病人ID" width="180" />
-			<el-table-column prop="encounterBusNo" label="门诊号" width="180" />
-			<el-table-column prop="genderEnum_enumText" label="性别" width="80" />
-			<el-table-column prop="phone" label="电话" width="120" />
-			<el-table-column prop="encounterTime" label="就诊时间" width="180" />
-			<el-table-column prop="subjectStatusEnum_enumText" label="状态" width="120" />
-			<el-table-column prop="organizationName" label="接诊医院" width="180" />
-			<el-table-column prop="doctorName" label="接诊医生" width="180" />
-			<!-- <el-table-column prop="address" label="会诊医院" width="180" />
-			<el-table-column prop="workCompany" label="会诊医生工作单位" width="180" />
-			<el-table-column prop="organizationName" label="协同服务" width="180" /> -->
-		</el-table>
-		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo"
-			v-model:limit="queryParams.pageSize" @pagination="getList" />
-	</div>
+    <el-table :data="outpatienRecordsList" border style="width: 100%">
+      <el-table-column prop="name" label="患者" width="180" />
+      <el-table-column prop="idCard" label="身份证" width="180" />
+      <el-table-column prop="description" label="疾病" width="180" />
+      <el-table-column prop="patientBusNo" label="病人ID" width="180" />
+      <el-table-column prop="encounterBusNo" label="门诊号" width="180" />
+      <el-table-column prop="genderEnum_enumText" label="性别" width="80" />
+      <el-table-column prop="phone" label="电话" width="120" />
+      <el-table-column prop="encounterTime" label="就诊时间" width="180" />
+      <el-table-column
+        prop="subjectStatusEnum_enumText"
+        label="状态"
+        width="120"
+      />
+      <el-table-column prop="organizationName" label="接诊医院" width="180" />
+      <el-table-column prop="doctorName" label="接诊医生" width="180" />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
 </template>
 
 <script setup name="outpatienRecords">
-import { ref, computed } from 'vue';
-import { listOutpatienRecords, listDoctorNames } from "./component/api"
+import { ref, computed } from "vue";
+import { listOutpatienRecords, listDoctorNames } from "./component/api";
 
 const showSearch = ref(true);
 const total = ref(0);
@@ -60,51 +98,50 @@ const doctorList = ref([]);
 const { proxy } = getCurrentInstance();
 
 const data = reactive({
-	form: {},
-	queryParams: {
-		pageNo: 1,
-		pageSize: 10,
-		doctorName: undefined,
-		searchKey: undefined,
-		phone: undefined,
-		patientid: undefined
-	},
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    doctorName: undefined,
+    searchKey: undefined,
+    phone: undefined,
+    patientid: undefined,
+  },
 });
 const { queryParams } = toRefs(data);
 
 const doctorOptions = computed(() => {
-	return doctorList.value.map((name, index) => ({
-		value: index, // 使用索引作为 value
-		label: name   // 使用名字作为 label
-	}));
+  return doctorList.value.map((name, index) => ({
+    value: index, // 使用索引作为 value
+    label: name, // 使用名字作为 label
+  }));
 });
 
 /** 查询门诊记录列表 */
 function getList() {
-	listOutpatienRecords(queryParams.value).then(response => {
-		outpatienRecordsList.value = response.data.records;
-		total.value = response.data.total;
-	});
-	listDoctorNames().then(response => {
-		console.log(response);
-		doctorList.value = response.data;
-	});
+  listOutpatienRecords(queryParams.value).then((response) => {
+    outpatienRecordsList.value = response.data.records;
+    total.value = response.data.total;
+  });
+  listDoctorNames().then((response) => {
+    console.log(response);
+    doctorList.value = response.data;
+  });
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-	queryParams.value.beginTime = dateRange.value[0];
-	queryParams.value.endTime = dateRange.value[1];
-	queryParams.value.pageNo = 1;
-	getList();
+  queryParams.value.beginTime = dateRange.value[0];
+  queryParams.value.endTime = dateRange.value[1];
+  queryParams.value.pageNo = 1;
+  getList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
-	dateRange.value = [];
-	proxy.resetForm("queryRef");
-	handleQuery();
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
 }
 
 getList();
-
 </script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
index 10d24025..04179261 100644
--- a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
@@ -1,278 +1,447 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-		   <el-form-item label="病人名称" prop="name">
-		      <el-input v-model="queryParams.name"  placeholder="请输入病人名称/缩写" clearable style="width: 200px"
-		         @keyup.enter="handleQuery" />
-		   </el-form-item>
-		   <el-form-item label="病人ID" prop="busNo">
-		      <el-input v-model="queryParams.busNo"  placeholder="请以输入病人ID" clearable style="width: 200px"
-		         @keyup.enter="handleQuery" />
-		   </el-form-item>
-		   <el-form-item>
-		      <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-		      <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-		   </el-form-item>
-		</el-form>
-		
-		<el-row :gutter="10" class="mb8">
-		   <el-col :span="1.5">
-		      <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">添加病人</el-button>
-		   </el-col>
-		   <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
-		
-		 <el-table :data="patientList" border style="width: 100%">
-		    <el-table-column prop="idCard" label="身份证号" width="180" />
-		    <el-table-column prop="busNo" label="病人ID" width="180" />
-			<el-table-column prop="name" label="病人名称" width="180" />
-			<el-table-column prop="genderEnum_enumText" label="性别" width="180" />
-			<el-table-column prop="maritalStatusEnum_enumText" label="婚姻状况" width="180" /><!--:formatter="formatMaritalStatus"-->
-			<el-table-column prop="nationalityCode" label="民族" width="180" />
-			<el-table-column prop="birthDate" label="生日" width="160" />
-			<el-table-column prop="phone" label="电话" width="140" />
-			<el-table-column prop="bloodAbo_text" label="血型ABO" width="140" />
-			<el-table-column prop="bloodRh_enumText" label="血型RH" width="140" />
-			<el-table-column prop="linkName" label="联系人" width="180" />
-			<el-table-column prop="linkTelcom" label="联系人电话" width="180" />
-			<el-table-column prop="linkRelationCode_enumText" label="联系人关系" width="180" />
-			<el-table-column prop="address" label="家庭地址" width="180" />
-			<el-table-column prop="prfsEnum_enumText" label="职业" width="180" />
-			<el-table-column prop="workCompany" label="工作单位" width="180" />
-			<el-table-column prop="organizationName" label="登记医院" width="180" />
-			<el-table-column prop="deceasedDate" label="死亡时间" width="180" />
-			<el-table-column prop="createTime" label="登记时间" width="180" />
-			<el-table-column label="操作" align="center" width="210" fixed="right" class-name="small-padding fixed-width">
-			   <template #default="scope">
-			      <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
-			      <el-button link type="primary" icon="View" @click="handleSee(scope.row)" v-hasPermi="['system:menu:add']">查看</el-button>
-			   </template>
-			</el-table-column>
-		  </el-table>
-		  <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
-		  
-		  <!-- 添加或修改对话框 -->
-		  <el-dialog :title="title" v-model="open" width="980px" append-to-body>
-			<el-form ref="patientRef" :model="form" :rules="rules" label-width="100px">
-				<el-row>
-					  <el-col :span="6">
-					  	<el-form-item label="姓名" prop="name">
-					  		<el-input v-model="form.name" clearable  :disabled="isViewMode"/>
-					  	</el-form-item>
-					  </el-col>
-					  <el-col :span="7">
-						<el-form-item label="其他姓名" prop="nameJson">
-						   <el-input v-model="form.nameJson" clearable :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col>	
-					  <el-col :span="6">
-						<el-form-item label="民族" prop="nationalityCode">
-						   <el-input v-model="form.nationalityCode" clearable :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col>					  
-				  </el-row>
-				  <el-row>
-					  <el-col :span="12">
-						<el-form-item label="性别" prop="genderEnum">
-						   <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
-								<el-radio v-for="item in administrativegenderList" :key="item.value" :label="item.value" >
-									{{ item.info }}
-								</el-radio>
-						   </el-radio-group>
-						</el-form-item>
-					  </el-col>
-					  <el-col :span="7">
-						<el-form-item label="活动标识" prop="tempFlag">
-						   <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
-								<el-radio v-for="item in tempFlagList" :key="item.value" :label="item.value" >
-									{{ item.info }}
-								</el-radio>
-						   </el-radio-group>
-						</el-form-item>
-					  </el-col>						  
-				  </el-row>
-				  <el-row>
-					  <el-col :span="7">
-						<el-form-item label="证件类别" prop="idType">
-						   <el-select v-model="form.idType" placeholder="证件类别" clearable :disabled="isViewMode">
-						      <el-option v-for="item in idTypeList" :key="item.value" :label="item.info" />
-						   </el-select>
-						</el-form-item>
-					  </el-col>
-					  <el-col :span="8">
-						<el-form-item label="证件号码" prop="idCard">
-						   <el-input v-model="form.idCard" clearable   :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col>
-					  <el-col :span="6">
-						<el-form-item label="国家编码" prop="countryCode">
-						   <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
-						</el-form-item>
-					  </el-col>					  
-				  </el-row>
-				  <el-row>
-					  <el-col :span="7">
-						<el-form-item label="联系方式" prop="phone">
-						   <el-input v-model="form.phone" clearable  :disabled="isViewMode" />
-						</el-form-item>
-					  </el-col>
-					  <el-col :span="8">
-						<el-form-item label="职业" prop="prfsEnum">
-                            <el-select v-model="form.prfsEnum" placeholder="职业" clearable :disabled="isViewMode">
-						      <el-option v-for="item in occupationtypeList"
-						         :key="item.value" :label="item.info" :value="item.value" />
-						   </el-select>
-						</el-form-item>
-					  </el-col>	
-					  <el-col :span="6">
-						<el-form-item label="工作单位" prop="workCompany">
-						   <el-input v-model="form.workCompany" clearable   :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col>				  
-				  </el-row>
-				  <el-row>
-					  <el-col :span="7">
-						<el-form-item label="联系人" prop="linkName">
-						   <el-input v-model="form.linkName" clearable   :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col>
-					  <el-col :span="8">
-						<el-form-item label="联系人关系" prop="linkRelationCode">
-							<el-select v-model="form.linkRelationCode" placeholder="联系人关系" clearable :disabled="isViewMode">
-						      <el-option v-for="item in familyrelationshiptypeList"
-						         :key="item.value" :label="item.info" :value="item.value" />
-						   </el-select>
-						</el-form-item>
-					  </el-col>	
-					  <el-col :span="6">
-						<el-form-item label="联系人电话" prop="linkRelationCode">
-						   <el-input v-model="form.linkTelcom" clearable   :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col>				  
-				  </el-row>
-				  <el-row>
-					  <el-col :span="10">
-						<el-form-item label="地址选择" prop="addressSelect">
-							<!-- <RegionFullGroup v-model="form.addressSelectvalue" @change="handleChangeAddress" :disabled="isViewMode"/> -->
-							<el-cascader :options="options" :props="{ checkStrictly: true, value: 'code', label: 'name' }" 
-							v-model="selectedOptions"  @change="handleChange" :disabled="isViewMode">
-      							<template #default="{ node, data }">
-        							<span>{{ data.name }}</span>
-        							<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-      							</template>
-    						</el-cascader>				 
-						</el-form-item>
-					  </el-col>		
-					  <el-col :span="8">
-						<el-form-item label="详细地址" prop="address">
-						   <el-input v-model="form.address" clearable   :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col>			  
-				  </el-row>
-				  <el-row>
-					  <el-col :span="10">
-						<el-form-item label="血型ABO" prop="bloodAbo">
-							<el-select v-model="form.bloodAbo" placeholder="血型ABO" clearable :disabled="isViewMode">
-						      <el-option v-for="item in bloodtypeaboList"
-						         :key="item.value" :label="item.info" :value="item.value" />
-						   </el-select>
-						</el-form-item>
-					  </el-col>
-					  <el-col :span="10">
-						<el-form-item label="血型RH" prop="bloodRh">
-							<el-select v-model="form.bloodRh" placeholder="血型RH" clearable :disabled="isViewMode">
-						      <el-option v-for="item in bloodtypearhList"
-						         :key="item.value" :label="item.info" :value="item.value" />
-						   </el-select>
-						</el-form-item>
-					  </el-col>
-				  </el-row>
-				  <el-row>
-					  <el-col :span="10">
-						<el-form-item label="婚姻状态" prop="maritalStatusEnum">
-							<el-select v-model="form.maritalStatusEnum" placeholder="婚姻状态" clearable :disabled="isViewMode">
-						      <el-option v-for="item in maritalstatusList"
-						         :key="item.value" :label="item.info" :value="item.value" />
-						   </el-select>
-						</el-form-item>
-					  </el-col>		
-					  <el-col :span="10">
-						<el-form-item label="死亡时间" prop="deceasedDate">
-							<el-date-picker v-model="form.deceasedDate" type="datetime" placeholder="请选择时间" 
-							format="YYYY/MM/DD HH:mm:ss" :disabled="isViewMode" value-format="YYYY/MM/DD HH:mm:ss"/>
-						</el-form-item>
-					  </el-col>			  
-				  </el-row>
-			</el-form>
-			<template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-		  </el-dialog>
-		  
-	</div>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-form-item label="病人名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入病人名称/缩写"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="病人ID" prop="busNo">
+        <el-input
+          v-model="queryParams.busNo"
+          placeholder="请以输入病人ID"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+          >添加病人</el-button
+        >
+      </el-col>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table :data="patientList" border style="width: 100%">
+      <el-table-column prop="idCard" label="身份证号" width="180" />
+      <el-table-column prop="busNo" label="病人ID" width="180" />
+      <el-table-column prop="name" label="病人名称" width="180" />
+      <el-table-column prop="genderEnum_enumText" label="性别" width="180" />
+      <el-table-column
+        prop="maritalStatusEnum_enumText"
+        label="婚姻状况"
+        width="180"
+      /><!--:formatter="formatMaritalStatus"-->
+      <el-table-column prop="nationalityCode" label="民族" width="180" />
+      <el-table-column prop="birthDate" label="生日" width="160" />
+      <el-table-column prop="phone" label="电话" width="140" />
+      <el-table-column prop="bloodAbo_text" label="血型ABO" width="140" />
+      <el-table-column prop="bloodRh_enumText" label="血型RH" width="140" />
+      <el-table-column prop="linkName" label="联系人" width="180" />
+      <el-table-column prop="linkTelcom" label="联系人电话" width="180" />
+      <el-table-column
+        prop="linkRelationCode_enumText"
+        label="联系人关系"
+        width="180"
+      />
+      <el-table-column prop="address" label="家庭地址" width="180" />
+      <el-table-column prop="prfsEnum_enumText" label="职业" width="180" />
+      <el-table-column prop="workCompany" label="工作单位" width="180" />
+      <el-table-column prop="organizationName" label="登记医院" width="180" />
+      <el-table-column prop="deceasedDate" label="死亡时间" width="180" />
+      <el-table-column prop="createTime" label="登记时间" width="180" />
+      <el-table-column
+        label="操作"
+        align="center"
+        width="210"
+        fixed="right"
+        class-name="small-padding fixed-width"
+      >
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']"
+            >修改</el-button
+          >
+          <el-button
+            link
+            type="primary"
+            icon="View"
+            @click="handleSee(scope.row)"
+            v-hasPermi="['system:menu:add']"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" v-model="open" width="980px" append-to-body>
+      <el-form
+        ref="patientRef"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="form.name" clearable :disabled="isViewMode" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="其他姓名" prop="nameJson">
+              <el-input
+                v-model="form.nameJson"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="民族" prop="nationalityCode">
+              <el-input
+                v-model="form.nationalityCode"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="性别" prop="genderEnum">
+              <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
+                <el-radio
+                  v-for="item in administrativegenderList"
+                  :key="item.value"
+                  :label="item.value"
+                >
+                  {{ item.info }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="活动标识" prop="tempFlag">
+              <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
+                <el-radio
+                  v-for="item in tempFlagList"
+                  :key="item.value"
+                  :label="item.value"
+                >
+                  {{ item.info }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="证件类别" prop="idType">
+              <el-select
+                v-model="form.idType"
+                placeholder="证件类别"
+                clearable
+                :disabled="isViewMode"
+              >
+                <el-option
+                  v-for="item in idTypeList"
+                  :key="item.value"
+                  :label="item.info"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="证件号码" prop="idCard">
+              <el-input
+                v-model="form.idCard"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="国家编码" prop="countryCode">
+              <el-input
+                v-model="form.countryCode"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model="form.phone" clearable :disabled="isViewMode" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="职业" prop="prfsEnum">
+              <el-select
+                v-model="form.prfsEnum"
+                placeholder="职业"
+                clearable
+                :disabled="isViewMode"
+              >
+                <el-option
+                  v-for="item in occupationtypeList"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工作单位" prop="workCompany">
+              <el-input
+                v-model="form.workCompany"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="联系人" prop="linkName">
+              <el-input
+                v-model="form.linkName"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系人关系" prop="linkRelationCode">
+              <el-select
+                v-model="form.linkRelationCode"
+                placeholder="联系人关系"
+                clearable
+                :disabled="isViewMode"
+              >
+                <el-option
+                  v-for="item in familyrelationshiptypeList"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系人电话" prop="linkRelationCode">
+              <el-input
+                v-model="form.linkTelcom"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="地址选择" prop="addressSelect">
+              <!-- <RegionFullGroup v-model="form.addressSelectvalue" @change="handleChangeAddress" :disabled="isViewMode"/> -->
+              <el-cascader
+                :options="options"
+                :props="{ checkStrictly: true, value: 'code', label: 'name' }"
+                v-model="selectedOptions"
+                @change="handleChange"
+                :disabled="isViewMode"
+              >
+                <template #default="{ node, data }">
+                  <span>{{ data.name }}</span>
+                  <span v-if="!node.isLeaf">
+                    ({{ data.children.length }})
+                  </span>
+                </template>
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="详细地址" prop="address">
+              <el-input
+                v-model="form.address"
+                clearable
+                :disabled="isViewMode"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="血型ABO" prop="bloodAbo">
+              <el-select
+                v-model="form.bloodAbo"
+                placeholder="血型ABO"
+                clearable
+                :disabled="isViewMode"
+              >
+                <el-option
+                  v-for="item in bloodtypeaboList"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="血型RH" prop="bloodRh">
+              <el-select
+                v-model="form.bloodRh"
+                placeholder="血型RH"
+                clearable
+                :disabled="isViewMode"
+              >
+                <el-option
+                  v-for="item in bloodtypearhList"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="婚姻状态" prop="maritalStatusEnum">
+              <el-select
+                v-model="form.maritalStatusEnum"
+                placeholder="婚姻状态"
+                clearable
+                :disabled="isViewMode"
+              >
+                <el-option
+                  v-for="item in maritalstatusList"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="死亡时间" prop="deceasedDate">
+              <el-date-picker
+                v-model="form.deceasedDate"
+                type="datetime"
+                placeholder="请选择时间"
+                format="YYYY/MM/DD HH:mm:ss"
+                :disabled="isViewMode"
+                value-format="YYYY/MM/DD HH:mm:ss"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script  setup name="patientManagement">
-import pcas from 'china-division/dist/pcas-code.json';
-import { ref, computed } from 'vue';
-import {addPatient,listPatient,updatePatient,lists} from "./component/api"
+import pcas from "china-division/dist/pcas-code.json";
+import { ref, computed } from "vue";
+import { addPatient, listPatient, updatePatient, lists } from "./component/api";
 
 const showSearch = ref(true);
 const open = ref(false);
 const title = ref("");
 const total = ref();
-const patientList = ref([])
-const maritalstatusList = ref([])  //婚姻
-const occupationtypeList = ref([]) //职业
-const administrativegenderList = ref([]) //性别
-const bloodtypeaboList = ref([]) //血型abo
-const bloodtypearhList = ref([]) //血型RH
-const familyrelationshiptypeList = ref([]) //家庭关系
+const patientList = ref([]);
+const maritalstatusList = ref([]); //婚姻
+const occupationtypeList = ref([]); //职业
+const administrativegenderList = ref([]); //性别
+const bloodtypeaboList = ref([]); //血型abo
+const bloodtypearhList = ref([]); //血型RH
+const familyrelationshiptypeList = ref([]); //家庭关系
 const addressCom = ref(""); //地址
-const tempFlagList = ref([])
-const idTypeList = ref([])
+const tempFlagList = ref([]);
+const idTypeList = ref([]);
 
 const options = ref(pcas); // 地区数据
 const selectedOptions = ref([]); // v-model 绑定的选中值
 
 const { proxy } = getCurrentInstance();
 
-const { patient_gender_enum,sys_idtype,prfs_enum,blood_rh,blood_abo,marital_status_enum,patient_temp_flag,link_relation_code} =
- proxy.useDict("patient_gender_enum", "sys_idtype","prfs_enum","blood_rh","blood_abo","marital_status_enum","patient_temp_flag","link_relation_code");
-
 const data = reactive({
   isViewMode: false,
   form: {},
   queryParams: {
-	pageNo: 1,
+    pageNo: 1,
     pageSize: 10,
     name: undefined,
-    busNo: undefined
+    busNo: undefined,
   },
   rules: {
     name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
     idCard: [
-    { required: true, message: '证件号码不能为空', trigger: 'blur' },
-    { min: 18, message: '证件号码不能少于18位', trigger: 'blur' } 
-  	],
+      { required: true, message: "证件号码不能为空", trigger: "blur" },
+      { min: 18, message: "证件号码不能少于18位", trigger: "blur" },
+    ],
     phone: [{ required: true, message: "联系方式不能为空", trigger: "blur" }],
   },
 });
-const { queryParams, form, rules,isViewMode } = toRefs(data);
+const { queryParams, form, rules, isViewMode } = toRefs(data);
 
 const handleChange = () => {
   const checkedNodes = selectedOptions.value.map((code) => {
     const node = findNodeByCode(options.value, code);
     return node ? node.name : null;
   });
-  form.value.addressProvince = checkedNodes[0] || '';
-  form.value.addressCity = checkedNodes[1] || '';
-  form.value.addressDistrict = checkedNodes[2] || '';
-  form.value.addressStreet = checkedNodes[3] || '';
-  form.value.address = '';
+  form.value.addressProvince = checkedNodes[0] || "";
+  form.value.addressCity = checkedNodes[1] || "";
+  form.value.addressDistrict = checkedNodes[2] || "";
+  form.value.addressStreet = checkedNodes[3] || "";
+  form.value.address = "";
 };
 
 // 递归查找节点
@@ -289,22 +458,21 @@ const findNodeByCode = (data, code) => {
 
 /** 查询菜单列表 */
 function getList() {
-  listPatient(queryParams.value).then(response => {
-	patientList.value = response.data.records
-	total.value = response.data.total;
+  listPatient(queryParams.value).then((response) => {
+    patientList.value = response.data.records;
+    total.value = response.data.total;
   });
-  lists().then(response => {
-	console.log(response);
-	occupationtypeList.value = response.data.occupationType
-	administrativegenderList.value = response.data.administrativeGender
-	bloodtypeaboList.value = response.data.bloodTypeABO
-	bloodtypearhList.value = response.data.bloodTypeRH
-	familyrelationshiptypeList.value = response.data.familyRelationshipType
-	maritalstatusList.value = response.data.maritalStatus
-	tempFlagList.value = response.data.whetherStatus
-	idTypeList.value = response.data.identityDocumentType
+  lists().then((response) => {
+    console.log(response);
+    occupationtypeList.value = response.data.occupationType;
+    administrativegenderList.value = response.data.administrativeGender;
+    bloodtypeaboList.value = response.data.bloodTypeABO;
+    bloodtypearhList.value = response.data.bloodTypeRH;
+    familyrelationshiptypeList.value = response.data.familyRelationshipType;
+    maritalstatusList.value = response.data.maritalStatus;
+    tempFlagList.value = response.data.whetherStatus;
+    idTypeList.value = response.data.identityDocumentType;
   });
-
 }
 
 /** 表单重置 */
@@ -316,33 +484,33 @@ function reset() {
     age: undefined,
     genderEnum: 0,
     idType: undefined,
-	idCard: undefined,
-	phone: undefined,
-	prfsEnum: undefined,
-	address: undefined,
-	tempFlag: undefined,
-	countryCode: undefined,
-	bloodRh: undefined,
-	bloodAbo: undefined,
-	nationalityCode: undefined,
-	deceasedDate: undefined,
-	linkName: undefined,
-	linkRelationCode: undefined,
-	linkTelcom: undefined,
-	workCompany: undefined,
-	addressCity: undefined,
-	addressDistrict: undefined,
-	addressStreet: undefined,
-	addressProvince: undefined,
-	maritalStatusEnum: undefined,
-	busNo: undefined,
-	organizationId: undefined,
+    idCard: undefined,
+    phone: undefined,
+    prfsEnum: undefined,
+    address: undefined,
+    tempFlag: undefined,
+    countryCode: undefined,
+    bloodRh: undefined,
+    bloodAbo: undefined,
+    nationalityCode: undefined,
+    deceasedDate: undefined,
+    linkName: undefined,
+    linkRelationCode: undefined,
+    linkTelcom: undefined,
+    workCompany: undefined,
+    addressCity: undefined,
+    addressDistrict: undefined,
+    addressStreet: undefined,
+    addressProvince: undefined,
+    maritalStatusEnum: undefined,
+    busNo: undefined,
+    organizationId: undefined,
   };
   proxy.resetForm("patientRef");
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-	queryParams.value.pageNo = 1;
+  queryParams.value.pageNo = 1;
   getList();
 }
 /** 重置按钮操作 */
@@ -353,32 +521,42 @@ function resetQuery() {
 /** 新增按钮操作 */
 function handleAdd() {
   reset();
-  selectedOptions.value = []
+  selectedOptions.value = [];
   isViewMode.value = false;
   open.value = true;
   title.value = "添加病人";
 }
 //查看按钮
-function handleSee(row){
-	isViewMode.value = true;
-	form.value = row;
-	open.value = true;
-	title.value = "查看病人";
+function handleSee(row) {
+  isViewMode.value = true;
+  form.value = row;
+  open.value = true;
+  title.value = "查看病人";
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
   form.value = JSON.parse(JSON.stringify(row));
-  addressCom.value = row.addressProvince + row.addressCity +  row.addressDistrict + row.addressStreet + row.address
-  const selectedOptions1 = ref([row.addressProvince,row.addressCity,row.addressDistrict,row.addressStreet])
+  addressCom.value =
+    row.addressProvince +
+    row.addressCity +
+    row.addressDistrict +
+    row.addressStreet +
+    row.address;
+  const selectedOptions1 = ref([
+    row.addressProvince,
+    row.addressCity,
+    row.addressDistrict,
+    row.addressStreet,
+  ]);
   const codes = convertAddressToCodes(selectedOptions1.value);
-  selectedOptions.value = codes.filter(code => code !== null);
+  selectedOptions.value = codes.filter((code) => code !== null);
   isViewMode.value = false;
   open.value = true;
   title.value = "修改菜单";
 }
 const convertAddressToCodes = (selectedOptions1) => {
-  const [provinceName, cityName, areaName, streetName] = selectedOptions1; 
+  const [provinceName, cityName, areaName, streetName] = selectedOptions1;
   const findCode = (data, name) => {
     for (const item of data) {
       if (item.name === name) {
@@ -418,23 +596,26 @@ function getAddress(form) {
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["patientRef"].validate(valid => {
+  proxy.$refs["patientRef"].validate((valid) => {
     if (valid) {
       if (form.value.busNo != undefined) {
-		const newAddress = form.value.addressProvince+form.value.addressCity +  form.value.addressDistrict + form.value.addressStreet + form.value.address
-		if (addressCom.value !== newAddress) {
-    		form.value.address = getAddress(form);
-		}
-        updatePatient(form.value).then(response => {
+        const newAddress =
+          form.value.addressProvince +
+          form.value.addressCity +
+          form.value.addressDistrict +
+          form.value.addressStreet +
+          form.value.address;
+        if (addressCom.value !== newAddress) {
+          form.value.address = getAddress(form);
+        }
+        updatePatient(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-		form.value.address = getAddress(form);
-		console.log("/***/*/*/*/*/*/*/*/*/")
-		// form.value.address = form.value.addressProvince+form.value.addressCity +  form.value.addressDistrict + form.value.addressStreet + form.value.address
-        addPatient(form.value).then(response => {
+        form.value.address = getAddress(form);
+        addPatient(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();