diff --git a/openhis-ui-vue3/package.json b/openhis-ui-vue3/package.json
index a820a230..f4535a66 100644
--- a/openhis-ui-vue3/package.json
+++ b/openhis-ui-vue3/package.json
@@ -21,6 +21,7 @@
     "@vueuse/core": "10.6.1",
     "axios": "0.27.2",
     "echarts": "5.4.3",
+    "element-china-area-data": "^6.1.0",
     "element-plus": "2.4.3",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
@@ -28,7 +29,10 @@
     "jsencrypt": "3.3.2",
     "nprogress": "0.2.0",
     "pinia": "2.1.7",
+    "province-city-china": "^8.5.8",
+    "v-region": "^3.3.0",
     "vue": "3.3.9",
+    "vue-area-linkage": "^5.1.0",
     "vue-cropper": "1.1.1",
     "vue-router": "4.2.5"
   },
@@ -37,9 +41,9 @@
     "@vue/compiler-sfc": "3.3.9",
     "sass": "1.69.5",
     "unplugin-auto-import": "0.17.1",
+    "unplugin-vue-setup-extend-plus": "1.0.0",
     "vite": "5.0.4",
     "vite-plugin-compression": "0.5.1",
-    "vite-plugin-svg-icons": "2.0.1",
-    "unplugin-vue-setup-extend-plus": "1.0.0"
+    "vite-plugin-svg-icons": "2.0.1"
   }
 }
diff --git a/openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js b/openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js
index 7a8185de..fdf0df89 100644
--- a/openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js
+++ b/openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js
@@ -44,4 +44,22 @@ export function listfamilyrelationshiptype() {
     })
   }
 
+// 新增
+export function addPatient(data) {
+  return request({
+    url: '/patientmanage/information/patient-information',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询菜单列表
+export function listPatient(query) {
+    return request({
+      url: '/patientmanage/information/patient-information-page',
+      method: 'get',
+      params: query
+    })
+  }
+
 
diff --git a/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue
index 9e03aeeb..0dca1f2d 100644
--- a/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue
@@ -22,24 +22,29 @@
 		   <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 		
-		 <el-table :data="tableData" border style="width: 100%">
+		 <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" label="性别" width="180" />
-			<el-table-column prop="maritalStatusEnum" label="婚姻状况" width="180" />
+			<el-table-column prop="maritalStatusEnum" label="婚姻状况" width="180" /><!--:formatter="formatMaritalStatus"-->
 			<el-table-column prop="nationalityCode" label="民族" width="180" />
-			<el-table-column prop="age" label="年龄" width="180" />
-			<el-table-column prop="phone" label="电话" width="180" />
+			<el-table-column prop="birthDate" label="生日" width="160" />
+			<el-table-column prop="phone" label="电话" width="140" />
+			<el-table-column prop="bloodAbo" label="血型ABO" width="140" />
+			<el-table-column prop="bloodRh" label="血型RH" width="140" />
+			<el-table-column prop="linkName" label="联系人" width="180" />
+			<el-table-column prop="linkTelcom" label="联系人电话" width="180" />
+			<el-table-column prop="linkJsons" label="联系人关系" width="180" />
 			<el-table-column prop="address" label="家庭地址" width="180" />
+			<el-table-column prop="prfsEnum" label="职业" width="180" />
 			<el-table-column prop="workCompany" label="工作单位" width="180" />
 			<el-table-column prop="organizationName" 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="Plus" @click="handleSee(scope.row)" v-hasPermi="['system:menu:add']">查看</el-button>
-			      <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</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>
@@ -51,29 +56,29 @@
 				<el-row>
 					  <el-col :span="6">
 					  	<el-form-item label="姓名" prop="name">
-					  		<el-input v-model="form.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" />
+						   <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" />
+						   <el-input v-model="form.nationalityCode" clearable :disabled="isViewMode"/>
 						</el-form-item>
 					  </el-col>					  
 				  </el-row>
 				  <el-row>
-					  <el-col :span="6">
+					  <!-- <el-col :span="6">
 						<el-form-item label="年龄" prop="age">
-						   <el-input v-model="form.age" />
+						   <el-input v-model="form.age" clearable :disabled="isViewMode"/>
 						</el-form-item>
-					  </el-col>
+					  </el-col> -->
 					  <el-col :span="8">
 						<el-form-item label="性别" prop="genderEnum">
-						   <el-radio-group v-model="form.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>
@@ -82,7 +87,7 @@
 					  </el-col>
 					  <el-col :span="7">
 						<el-form-item label="活动标识" prop="tempFlag">
-						   <el-radio-group v-model="form.tempFlag">
+						   <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
 								<el-radio v-for="dict in patient_temp_flag" :key="dict.value" :label="dict.value" >
 									{{ dict.label }}
 								</el-radio>
@@ -93,7 +98,7 @@
 				  <el-row>
 					  <el-col :span="7">
 						<el-form-item label="证件类别" prop="idType">
-						   <el-select v-model="form.idType" placeholder="证件类别" clearable >
+						   <el-select v-model="form.idType" placeholder="证件类别" clearable :disabled="isViewMode">
 						      <el-option v-for="dict in sys_idtype"
 						         :key="dict.value" :label="dict.label" :value="dict.value" />
 						   </el-select>
@@ -101,24 +106,24 @@
 					  </el-col>
 					  <el-col :span="8">
 						<el-form-item label="证件号码" prop="idCard">
-						   <el-input v-model="form.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"   />
+						   <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"   />
+						   <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 >
+                            <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>
@@ -126,19 +131,19 @@
 					  </el-col>	
 					  <el-col :span="6">
 						<el-form-item label="工作单位" prop="workCompany">
-						   <el-input v-model="form.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"   />
+						   <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 >
+							<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>
@@ -146,26 +151,33 @@
 					  </el-col>	
 					  <el-col :span="6">
 						<el-form-item label="联系人电话" prop="linkRelationCode">
-						   <el-input v-model="form.linkTelcom"   />
+						   <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"/>
+							<!-- <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" >
+      							<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"   />
+						   <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 >
+							<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>
@@ -173,7 +185,7 @@
 					  </el-col>
 					  <el-col :span="10">
 						<el-form-item label="血型RH" prop="bloodRh">
-							<el-select v-model="form.bloodRh" placeholder="血型RH" clearable >
+							<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>
@@ -183,7 +195,7 @@
 				  <el-row>
 					  <el-col :span="10">
 						<el-form-item label="婚姻状态" prop="maritalStatusEnum">
-							<el-select v-model="form.maritalStatusEnum" placeholder="婚姻状态" clearable >
+							<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>
@@ -191,7 +203,8 @@
 					  </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"/>
+							<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>
@@ -208,15 +221,18 @@
 </template>
 
 <script  setup name="patientManagement">
+import pcas from 'china-division/dist/pcas-code.json';
 import { ref, computed } from 'vue';
 import familyRelationships from "./component/familyRelationships"
-import {listmaritalstatus,listoccupationtype,lisadministrativegender,listbloodtypeabo,listbloodtypearh,listfamilyrelationshiptype} from "./component/api"
-import { RegionFullGroup } from 'v-region'
+import {listmaritalstatus,listoccupationtype,lisadministrativegender,listbloodtypeabo,listbloodtypearh,listfamilyrelationshiptype,
+	addPatient,listPatient} from "./component/api"
+import { RegionFullGroup  } from 'v-region'
 
 const showSearch = ref(true);
 const open = ref(false);
 const title = ref("");
 const total = ref(1);
+const patientList = ref([])
 const maritalstatusList = ref([])  //婚姻
 const occupationtypeList = ref([]) //职业
 const administrativegenderList = ref([]) //性别
@@ -224,11 +240,15 @@ const bloodtypeaboList = ref([]) //血型abo
 const bloodtypearhList = ref([]) //血型RH
 const familyrelationshiptypeList = 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: {
 	pageNum: 1,
@@ -240,16 +260,44 @@ const data = reactive({
     name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
     idCard: [
     { required: true, message: '证件号码不能为空', trigger: 'blur' },
-    { min: 18, message: '证件号码不能少于18位', trigger: 'blur' }
+    // { min: 18, message: '证件号码不能少于18位', trigger: 'blur' }
   	],
     phone: [{ required: true, message: "联系方式不能为空", trigger: "blur" }],
   },
 });
-const { queryParams, form, rules } = 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] || '';
+};
+
+// 递归查找节点
+const findNodeByCode = (data, code) => {
+  for (const item of data) {
+    if (item.code === code) return item;
+    if (item.children) {
+      const result = findNodeByCode(item.children, code);
+      if (result) return result;
+    }
+  }
+  return null;
+};
 
 /** 查询菜单列表 */
 function getList() {
+// console.log("v-region",RegionData)
+  listPatient(queryParams.value).then(response => {
+    console.log("res",response)
+	patientList.value = response.data.records
+	total.value = response.data.total;
+  });
   listmaritalstatus().then(response => {
 	maritalstatusList.value = response.data
   });
@@ -300,7 +348,6 @@ function reset() {
 	maritalStatusEnum: undefined,
 	busNo: undefined,
 	organizationId: undefined,
-	addressSelectvalue : {  province: null, city: null, area: null, town: null },
   };
   proxy.resetForm("patientRef");
 }
@@ -315,41 +362,77 @@ function resetQuery() {
   handleQuery();
 }
 /** 新增按钮操作 */
-function handleAdd(row) {
-	console.log("123")
+function handleAdd() {
   reset();
+  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 handleUpdate(row) {
+  reset();
+  form.value = row;
+  const selectedOptions1 = ref([row.addressProvince,row.addressCity,row.addressDistrict,row.addressStreet])
+  const codes = convertAddressToCodes(selectedOptions1.value);
+  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 findCode = (data, name) => {
+    for (const item of data) {
+      if (item.name === name) {
+        return item.code;
+      }
+      if (item.children) {
+        const result = findCode(item.children, name);
+        if (result) return result;
+      }
+    }
+    return null;
+  };
+
+  const provinceCode = findCode(options.value, provinceName);
+  const cityCode = findCode(options.value, cityName);
+  const areaCode = findCode(options.value, areaName);
+  const streetCode = findCode(options.value, streetName);
+
+  return [provinceCode, cityCode, areaCode, streetCode];
+};
 /** 取消按钮 */
 function cancel() {
   open.value = false;
   reset();
 }
-/**地区选择器 */
-function handleChangeAddress(data){
-  form.value.addressProvince = data.province || '';
-  form.value.addressCity = data.city || '';
-  form.value.addressDistrict = data.area || '';
-  form.value.addressStreet = data || '';
-}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["patientRef"].validate(valid => {
     if (valid) {
-    //   if (form.value.menuId != undefined) {
-    //     updateMenu(form.value).then(response => {
-    //       proxy.$modal.msgSuccess("修改成功");
-    //       open.value = false;
-    //       getList();
-    //     });
-    //   } else {
-    //     addMenu(form.value).then(response => {
-    //       proxy.$modal.msgSuccess("新增成功");
-    //       open.value = false;
-    //       getList();
-    //     });
-    //   }
+      if (form.value.busNo != undefined) {
+        updateMenu(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+		// form.value.prfsEnum = String(form.value.prfsEnum);
+		console.log("form.value",form.value)
+        addPatient(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
     }
   });
 }