diff --git a/openhis-ui-vue3/src/views/clinicManagement/skinRecord/component/api.js b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/component/api.js
new file mode 100644
index 00000000..d5a76fca
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/component/api.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function listSkinRecord(query) {
+    return request({
+      url: '/patientmanage/records/outpatient-record-page',
+      method: 'get',
+      params: query
+    })
+  }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
new file mode 100644
index 00000000..9dee2074
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
@@ -0,0 +1,284 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+		   <el-form-item label="门诊号" prop="patientname">
+		      <el-input v-model="queryParams.patientname"  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="病人ID" prop="phone">
+		      <el-input v-model="queryParams.phone"  placeholder="请输入联系方式" 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="查询时间" prop="patientname">
+            <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="patientid">
+				<el-select v-model="queryParams.bloodAbo" placeholder="请选择医生" clearable   @keyup.enter="handleQuery" style="width: 160px">
+					<el-option v-for="item in bloodtypeaboList"
+					: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-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>
+		   <el-col :span="1.5">
+		      <el-button type="success" plain icon="EditPen" @click="handleUpdate" v-hasPermi="['system:menu:add']">修改</el-button>
+		   </el-col>
+		   <el-col :span="1.5">
+		      <el-button type="danger" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">取消修改</el-button>
+		   </el-col>
+		   <el-col :span="1.5">
+		      <!-- <el-button type="warning" 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="skinRecordList" border style="width: 100%">
+		    <el-table-column prop="idCard" label="处方号" width="150" />
+		    <el-table-column prop="busNo" label="门诊号" width="150" />
+			<el-table-column prop="name" label="病人" width="120" />
+			<el-table-column prop="genderEnum" label="药品信息" width="150" />
+			<el-table-column prop="maritalStatusEnum" label="药品" width="160" />
+			<el-table-column prop="nationalityCode" label="药品批号" width="160" />
+			<el-table-column prop="age" label="状态" width="80" />
+			<el-table-column prop="phone" label="皮试结果" width="120" />
+			<el-table-column prop="address" label="执行护士" width="130" />
+			<el-table-column prop="workCompany" label="核对护士" width="130" />
+			<el-table-column prop="organizationName" label="开始时间" width="180" />
+			<el-table-column prop="organizationName" label="结束时间" width="180" />
+			<el-table-column prop="organizationName" label="开单医生" width="180" />
+			<el-table-column prop="organizationName" label="发药状态" width="180" />
+			<el-table-column prop="organizationName" 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="Finished" @click="submitForm(scope.row)" v-hasPermi="['system:menu:add']">确认</el-button>
+			      <el-button link type="primary" icon="Finished" @click="sign(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="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="门诊号" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="病人" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="药品信息" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<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="7">
+						<el-form-item label="药品批号" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="状态" prop="name">
+							<el-select v-model="form.linkRelationCode" 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="name">
+							<el-select v-model="form.linkRelationCode" 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="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="核对护士" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="7">
+						<el-form-item label="开始时间" prop="name">
+							<el-date-picker v-model="form.startTime" type="datetime" placeholder="开始时间" />
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="结束时间" prop="name">
+							<el-date-picker v-model="form.endTime" type="datetime" placeholder="结束时间" />
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="开单医生" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="7">
+						<el-form-item label="发药状态" prop="name">
+							<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="备注" prop="name">
+							<el-input v-model="form.name" 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 { listSkinRecord } from './component/api'; 
+
+const showSearch = ref(true);
+const total = ref(1);
+const dateRange = ref([]);
+const skinRecordList = ref([]);
+const skinResultList = ref([]);
+const statusList = ref([]);
+
+const open = ref(false);
+
+
+const { proxy } = getCurrentInstance();
+
+const data = reactive({
+  form: {},
+  queryParams: {
+	pageNo: 1,
+    pageSize: 10,
+    patientname: undefined,
+    patientid: undefined
+  },
+});
+const { queryParams,form } = toRefs(data);
+/** 表单重置 */
+function reset() {
+  form.value = {
+    name: undefined,
+    nameJson: undefined,
+    menuName: undefined,
+    age: undefined,
+    genderEnum: 0,
+    idType: undefined,
+	idCard: undefined,
+	phone: undefined,
+	prfsEnum: undefined,
+	address: undefined,
+	tempFlag: undefined,
+  };
+  proxy.resetForm("skinRecordRef");
+}
+
+/** 查询门诊记录列表 */
+function getList() {
+  listSkinRecord(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+    jobLogList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+function cancel() {
+  open.value = false;
+  reset();
+}
+function handleUpdate() {
+	open.value = true;
+}
+function sign(row){
+	row.sign = nurse;
+}
+
+function saveForm() {
+  const index = skinRecordList.value.findIndex(item => item.id === form.id);
+  if (index !== -1) {
+    tableData.value[index].name = form.name;
+    tableData.value[index].age = form.age;
+  }
+  open.value = false;
+}
+
+function submitForm() {
+  proxy.$refs["patientRef"].validate(valid => {
+    if (valid) {
+        updatePatient(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+    }
+  });
+}
+
+// getList();
+
+</script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
index 77818af0..f9f7f5cc 100644
--- a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
+++ b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
@@ -31,6 +31,7 @@
 			<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" />
diff --git a/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue
index e389b0a0..eb8544f8 100644
--- a/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue
@@ -413,6 +413,20 @@ function cancel() {
   open.value = false;
   reset();
 }
+// 获取完整地址字符串
+function getAddress(form) {
+  const addressParts = [
+    form.value.addressProvince,
+    form.value.addressCity,
+    form.value.addressDistrict,
+    form.value.addressStreet,
+    form.value.address,
+  ];
+  // 使用 reduce 方法拼接地址
+  return addressParts.reduce((acc, part) => {
+    return part ? acc + part : acc;
+  }, "");
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["patientRef"].validate(valid => {
@@ -420,7 +434,7 @@ function submitForm() {
       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 = newAddress;
+    		form.value.address = getAddress(form);
 		}
         updatePatient(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
@@ -428,7 +442,8 @@ function submitForm() {
           getList();
         });
       } else {
-		form.value.address = form.value.addressProvince+form.value.addressCity +  form.value.addressDistrict + form.value.addressStreet + form.value.address
+		form.value.address = getAddress(form);
+		// form.value.address = form.value.addressProvince+form.value.addressCity +  form.value.addressDistrict + form.value.addressStreet + form.value.address
         addPatient(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;