diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
index 13cd1d01..0a779d3a 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
@@ -110,7 +110,7 @@ public class Patient extends HisBaseEntity {
private String linkName;
/** 联系人关系 */
- private Integer linkRelationCode;
+ private FamilyRelationshipType linkRelationCode;
/** 联系人电话 */
private String linkTelcom;
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/device.js b/openhis-ui-vue3/src/views/catalog/device/components/device.js
new file mode 100644
index 00000000..d48b4b78
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/openhis";
+
+// 查询器材目录列表
+export function getDeviceList(query) {
+ return request({
+ url: '/datadictionary/device/information-page',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询器材目录详细
+export function getDeviceOne(id) {
+ return request({
+ url: '/datadictionary/device/information-one/' + parseStrEmpty(id),
+ method: 'get'
+ })
+}
+
+// 新增器材目录
+export function addDevice(data) {
+ return request({
+ url: '/datadictionary/device/information',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改器材目录
+export function editDevice(data) {
+ return request({
+ url: '/datadictionary/device/information',
+ method: 'put',
+ data: data
+ })
+}
+
+// // 删除器材目录
+// export function delUser(userId) {
+// return request({
+// url: '/system/user/' + userId,
+// method: 'delete'
+// })
+// }
+
+// 器材目录分类查询
+export function getDiseaseTreatmentInit() {
+ return request({
+ url: '/datadictionary/device/init',
+ method: 'get'
+ })
+}
+
+// 停用病种目录
+export function stopDevice(ids) {
+ console.log(ids)
+ return request({
+ url: '/datadictionary/device/information-stop',
+ method: 'put',
+ data: ids
+ })
+}
+
+// 启用病种目录
+export function startDevice(ids) {
+ console.log(ids)
+ return request({
+ url: '/datadictionary/device/information-start',
+ method: 'put',
+ data: ids
+ })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
new file mode 100644
index 00000000..c64dc23c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue
new file mode 100644
index 00000000..aa29e8f9
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue
@@ -0,0 +1,363 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/openhis-ui-vue3/src/views/catalog/device/index.vue b/openhis-ui-vue3/src/views/catalog/device/index.vue
new file mode 100644
index 00000000..622f9970
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -0,0 +1,600 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加新项目
+
+
+
+ 停用
+
+
+ 启用
+
+
+ 查询
+
+
+ 导出Excel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 查看
+
+
+
+
+
+
+
+
+