From 3180f1e06265dc2bd143c08b2bf912fa4982017b Mon Sep 17 00:00:00 2001
From: duhe <duhe@ccbjb.com.cn>
Date: Thu, 27 Feb 2025 18:32:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=99=A8=E6=9D=90=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=20up=20by=20dh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/catalog/device/components/device.js |  73 +++
 .../device/components/deviceDialog.vue        | 382 +++++++++++
 .../device/components/deviceViewDialog.vue    | 363 +++++++++++
 .../src/views/catalog/device/index.vue        | 600 ++++++++++++++++++
 .../src/views/catalog/disease/index.vue       |   4 +-
 .../catalog/medicine/components/medicine.js   |  17 -
 .../src/views/catalog/medicine/index.vue      |  40 +-
 7 files changed, 1440 insertions(+), 39 deletions(-)
 create mode 100644 openhis-ui-vue3/src/views/catalog/device/components/device.js
 create mode 100644 openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/catalog/device/index.vue

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 @@
+<template>
+  <div class="app-container">
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" v-model="visible" width="800px" append-to-body>
+      <el-form
+        :model="form"
+        :rules="rules"
+        ref="medicationRef"
+        label-width="110px"
+        label-position="left"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="编号" prop="busNo">
+              <el-input
+                v-model="form.busNo"
+                placeholder="请输入编码"
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="器材名称" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入器材名称"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拼音码(器材名称)" prop="pyStr" class="custom-label-spacing">
+              <el-input v-model="form.pyStr" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="器材五笔拼音" prop="wbStr">
+              <el-input v-model="form.wbStr" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="器材分类" prop="categoryEnum">
+              <el-input
+                v-model="form.categoryEnum"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="器材种类" prop="typeCode">
+              <el-input v-model="form.typeCode" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="包装单位" prop="unitCode">
+              <el-input v-model="form.unitCode" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="包装规格" prop="size">
+              <el-input
+                v-model="form.size"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="最小单位" prop="minUnitCode">
+              <el-input
+                v-model="form.minUnitCode"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="拆零比" prop="partPercent">
+              <el-input
+                v-model="form.partPercent"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="产品型号" prop="modelNumber">
+              <el-input
+                v-model="form.modelNumber"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="高值器材标志" prop="hvcmFlag">
+              <el-input
+                v-model="form.hvcmFlag"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="销售单位" prop="salesUnitCode">
+              <el-input
+                v-model="form.salesUnitCode"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批准文号" prop="approvalNumber">
+              <el-input
+                v-model="form.approvalNumber"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="医保标记" prop="ybFlag">
+              <!-- <el-input v-model="form.ybFlag" placeholder="" maxlength="30" /> -->
+              <el-input v-model="form.ybFlag" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="医保编码" prop="conditionCode">
+              <el-input v-model="form.ybNo" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="医保对码标记" prop="ybMatchFlag">
+              <el-checkbox v-model="form.ybMatchFlag"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="状态" prop="injectFlag">
+              <el-input
+                v-model="form.statusEnum"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="生产厂家" prop="manufacturerId">
+              <el-input
+                v-model="form.manufacturerId"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供应商" prop="supplyId">
+              <el-input v-model="form.supplyId" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="适用范围" prop="jurisdiction">
+              <el-input
+                v-model="form.jurisdiction"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="执行科室" prop="ruleId">
+              <el-input v-model="form.ruleId" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="器材版本" prop="version">
+              <el-input v-model="form.version" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="主要成分" prop="substanceText">
+              <el-input
+                v-model="form.substanceText"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="过敏标记" prop="allergenFlag">
+              <el-checkbox v-model="form.allergenFlag"></el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="说明" prop="description">
+              <el-input
+                v-model="form.description"
+                :autosize="{ minRows: 4, maxRows: 10 }"
+                type="textarea"
+                placeholder=""
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer v-if="title !='查看'">
+        <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="MedicineDialog">
+import {
+  getDeviceList,
+  editDevice,
+  addDevice,
+  getDiseaseTreatmentInit,
+  getDeviceOne,
+} from "./device";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
+
+const title = ref("");
+const visible = ref(false);
+const emits = defineEmits(["submit"]); // 声明自定义事件
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 50,
+    diseaseName: undefined, // 疾病名称
+    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+  },
+  rules: {
+    // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
+    // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+    // conditionCode: [
+    //   { required: true, message: "编码不能为空", trigger: "blur" },
+    // ],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const props = defineProps({
+  item: {
+    type: Object,
+    required: false,
+  },
+  title: {
+    type: String,
+    required: false,
+  },
+});
+
+// 显示弹框
+function show() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  title.value = ''
+  title.value = props.title
+  console.log(props, "22222",title.value);
+  visible.value = true;
+}
+// 显示弹框
+function edit() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  title.value = ''
+  title.value = props.title
+  form.value = props.item;
+  visible.value = true;
+}
+/** 重置操作表单 */
+function reset() {
+  form.value = {
+    id: undefined,
+    busNo: undefined, // 编码
+    name: undefined, // 名称
+    pyStr: undefined, // 拼音码
+    wbStr: undefined, // 五笔码
+    categoryEnum: undefined, // 类别
+    typeCode: undefined, // 类型编码
+    unitCode: undefined, // 单位编码
+    size: undefined, // 规格
+    partPercent: undefined, // 占比
+    minUnitCode: undefined, // 最小单位编码
+    modelNumber: undefined, // 型号
+    hvcmFlag: undefined, // 高值器材标志
+    salesUnitCode: undefined, // 销售单位编码
+    approvalNumber: undefined, // 批准文号
+    ybFlag: undefined, // 医保标志
+    ybNo: undefined, // 医保编码
+    ybMatchFlag: undefined, // 医保对码标记
+    statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+    manufacturerId: undefined, // 厂家编码
+    supplyId: undefined, // 供应商编码
+    description: undefined, // 说明
+    jurisdiction: undefined, // 适用范围
+    ruleId: undefined, // 执行科室
+    version: undefined, // 器材版本
+    substanceText: undefined, // 主要成分
+    allergenFlag: undefined, // 过敏标记
+  };
+  proxy.resetForm("medicationRef");
+}
+
+/** 提交按钮 */
+function submitForm() {
+  if (form.value.id != undefined) {
+    // form.value.status
+    //   ? (form.value.statusEnum = "3")
+    //   : (form.value.statusEnum = "2");
+    // console.log(form.value, "editDevice", form.value.statusEnum);
+    editDevice(form.value).then((response) => {
+      proxy.$modal.msgSuccess("修改成功");
+      visible.value = false;
+      reset(); // 重置表单数据
+    });
+  } else {
+    addDevice(form.value).then((response) => {
+      // 触发自定义事件，并传递数据给父组件
+      emits("submit");
+      proxy.$modal.msgSuccess("新增成功");
+      visible.value = false;
+      reset(); // 重置表单数据
+    });
+  }
+}
+defineExpose({
+  show,
+  edit,
+});
+</script>
+<style scoped>
+.el-form--inline .el-form-item {
+  display: inline-flex;
+  vertical-align: middle;
+  margin-right: 10px !important;
+}
+
+/* 使用深度选择器 */
+.custom-label-spacing :deep(.el-form-item__label) {
+  line-height: 1.2; /* 调整行间距 */
+  margin-bottom: 4px; /* 调整 label 和输入框之间的间距 */
+}
+</style>
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 @@
+<template>
+  <div class="app-container">
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" v-model="visible" width="800px" append-to-body>
+      <el-form
+        :model="form"
+        :rules="rules"
+        ref="diseaseRef"
+        label-width="110px"
+        label-position="left"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="编号" prop="busNo">
+              <el-input
+                v-model="form.busNo"
+                placeholder="请输入编码"
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品名" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入药品名"
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拼音码(品名)" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="厂家/产地" prop="conditionCode">
+              <el-select v-model="queryParams.status" clearable>
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批准文号" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="条形码" prop="name">
+              <el-input v-model="form.name" placeholder="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="单位" prop="conditionCode">
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零售价" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item
+              label="最小单位"
+              prop="conditionCode"
+            >
+              <el-select v-model="queryParams.status" clearable :disabled="true">
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拆零比" prop="conditionCode">
+              <el-input
+                v-model="form.conditionCode"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拆零零售价" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="处方限量（最小单位）" prop="conditionCode" class="custom-label-spacing">
+              <el-input
+                v-model="form.conditionCode"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="皮试判别" prop="name">
+              <el-checkbox v-model="form.status" :disabled="true"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="注射药品" prop="name">
+              <el-checkbox v-model="form.status" :disabled="true"></el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="给药途径" prop="conditionCode">
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="用药频次" prop="name" :disabled="true">
+              <el-select v-model="queryParams.status" clearable :disabled="true">
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单次剂量" prop="name" inline :disabled="true">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :disabled="form.id != undefined"
+                style="width: 49%"
+              />
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                style="width: 49%"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="剂型" prop="conditionCode">
+              <el-select v-model="queryParams.status" clearable :disabled="true">
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算项目" prop="name">
+              <el-select
+                v-model="queryParams.status"
+                clearable
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="说明" prop="status">
+              <el-input
+                v-model="textarea2"
+                :autosize="{ minRows: 4, maxRows: 10 }"
+                type="textarea"
+                placeholder=""
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MedicineDialog">
+// import {
+//   getDiseaseList,
+//   editDisease,
+//   addDisease,
+//   getDiseaseCategory,
+//   getDiseaseOne,
+// } from "./components/medicine";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
+
+const diseaseList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const selectedData = ref([]); // 存储选择的行数据
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+const deptName = ref("");
+const visible = ref(false);
+const conditionDefinitionOptions = ref(undefined);
+// const initPassword = ref(undefined);
+// const postOptions = ref([]);
+// const roleOptions = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 50,
+    diseaseName: undefined, // 疾病名称
+    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+  },
+  rules: {
+    name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+    conditionCode: [
+      { required: true, message: "编码不能为空", trigger: "blur" },
+    ],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const props = defineProps({
+  item: {
+    type: Object,
+    required: false,
+  },
+});
+
+// 显示弹框
+function show() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  visible.value = true;
+}
+// 显示弹框
+function edit() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  console.log(props, "22222");
+  console.log(props.item);
+  console.log("props.item");
+  form.value = props.item;
+  visible.value = true;
+}
+defineExpose({
+  show,
+  edit,
+});
+</script>
+<style scoped>
+.el-form--inline .el-form-item {
+  display: inline-flex;
+  vertical-align: middle;
+  margin-right: 10px !important;
+}
+
+/* 使用深度选择器 */
+.custom-label-spacing :deep(.el-form-item__label) {
+  line-height: 1.2; /* 调整行间距 */
+  margin-bottom: 4px; /* 调整 label 和输入框之间的间距 */
+}
+</style>
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 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--器材目录-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-tree
+            :data="deviceCategories"
+            :props="{ label: 'info', children: 'children' }"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="treeRef"
+            node-key="id"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--器材目录-->
+      <el-col :span="20" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryRef"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-row :gutter="24">
+            <!-- <el-col :span="5">
+              <el-form-item label="项目名" prop="searchKey" label-width="55">
+                <el-input
+                  v-model="queryParams.searchKey"
+                  placeholder="品名/商品名/英文品名/编码/拼音"
+                  clearable
+                  style="width: 240px"
+                  @keyup.enter="handleQuery"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="4">
+              <el-form-item label="状态" prop="statusEnum" label-width="50">
+                <el-select v-model="queryParams.statusEnum" clearable>
+                  <el-option
+                    v-for="status in statusFlagOptions"
+                    :key="status.value"
+                    :label="status.info"
+                    :value="status.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item
+                label="医保是否对码"
+                prop="ybMatchFlag"
+                label-width="100"
+              >
+                <el-select
+                  v-model="queryParams.ybMatchFlag"
+                  placeholder=""
+                  clearable
+                >
+                  <el-option
+                    v-for="item in exeOrganizations"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="执行科室" prop="ruleId" label-width="100">
+                <el-select
+                  v-model="queryParams.ruleId"
+                  placeholder=""
+                  clearable
+                >
+                  <el-option
+                    v-for="item in exeOrganizations"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="Plus"
+              @click="openAddDevice"
+              v-hasPermi="['system:user:add']"
+              >添加新项目</el-button
+            >
+          </el-col>
+          <!-- <el-col :span="1.5">
+                  <el-button
+                     type="primary"
+                     plain
+                     icon="Plus"
+                     @click="handleAdd"
+                     v-hasPermi="['system:user:add']"
+                  >添加为本机构项目</el-button>
+               </el-col> -->
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="Remove"
+              :disabled="multiple"
+              @click="handleClose"
+              v-hasPermi="['system:user:edit']"
+              >停用</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="CirclePlus"
+              :disabled="multiple"
+              @click="handleStart"
+              v-hasPermi="['system:user:remove']"
+              >启用</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="Search"
+              @click="getList"
+              v-hasPermi="['system:user:import']"
+              >查询</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['system:user:export']"
+              >导出Excel</el-button
+            >
+          </el-col>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="deviceList"
+          @selection-change="handleSelectionChange"
+          width="90%"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column
+            label="编码"
+            align="center"
+            key="busNo"
+            prop="busNo"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="器材名称"
+            align="center"
+            key="name"
+            prop="name"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="拼音"
+            align="center"
+            key="pyStr"
+            prop="pyStr"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="器材分类"
+            align="center"
+            key="categoryEnum"
+            prop="categoryEnum"
+            :show-overflow-tooltip="true"
+            width="100"
+          />
+          <el-table-column
+            label="器材种类"
+            align="center"
+            key="typeCode"
+            prop="typeCode"
+            :show-overflow-tooltip="true"
+            width="50"
+          />
+          <el-table-column
+            label="包装单位"
+            align="center"
+            key="unitCode"
+            prop="unitCode"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="包装规格"
+            align="center"
+            key="size"
+            prop="size"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="拆零比"
+            align="center"
+            key="partPercent"
+            prop="partPercent"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="最小使用单位"
+            align="center"
+            key="minUnitCode"
+            prop="minUnitCode"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="产品型号"
+            align="center"
+            key="modelNumber"
+            prop="modelNumber"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="高值器材标志"
+            align="center"
+            key="hvcmFlag"
+            prop="hvcmFlag"
+            :show-overflow-tooltip="true"
+          />
+
+          <el-table-column
+            label="销售单位"
+            align="center"
+            key="salesUnitCode"
+            prop="salesUnitCode"
+            :show-overflow-tooltip="true"
+            width="100"
+          />
+          <el-table-column
+            label="批准文号"
+            align="center"
+            key="approvalNumber"
+            prop="approvalNumber"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="医保标记"
+            align="center"
+            key="ybFlag"
+            prop="ybFlag"
+            :show-overflow-tooltip="true"
+            width="110"
+          />
+          <el-table-column
+            label="医保编码"
+            align="center"
+            key="ybNo"
+            prop="ybNo"
+            :show-overflow-tooltip="true"
+            width="110"
+          />
+          <el-table-column
+            label="医保对码标记"
+            align="center"
+            key="ybMatchFlag"
+            prop="ybMatchFlag"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="状态"
+            align="center"
+            key="statusEnum"
+            prop="statusEnum"
+            :show-overflow-tooltip="true"
+            width="90"
+          />
+          <el-table-column
+            label="生产厂家"
+            align="center"
+            key="manufacturerId"
+            prop="manufacturerId"
+            :show-overflow-tooltip="true"
+            width="90"
+          />
+          <el-table-column
+            label="供应商"
+            align="center"
+            key="supplyId"
+            prop="supplyId"
+            :show-overflow-tooltip="true"
+            width="110"
+          />
+          <el-table-column
+            label="说明"
+            align="center"
+            key="description"
+            prop="description"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="适用范围"
+            align="center"
+            key="jurisdiction"
+            prop="jurisdiction"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
+          <el-table-column
+            label="执行科室"
+            align="center"
+            key="ruleId"
+            prop="ruleId"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="器材版本"
+            align="center"
+            key="version"
+            prop="version"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
+          <el-table-column
+            label="主要成分"
+            align="center"
+            key="substanceText"
+            prop="substanceText"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="过敏标记"
+            align="center"
+            key="allergenFlag"
+            prop="allergenFlag"
+            :show-overflow-tooltip="true"
+            width="90"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="150"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template #default="scope">
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="openEditDevice(scope.row)"
+                v-hasPermi="['system:user:edit']"
+                >编辑</el-button
+              >
+              <el-button
+                link
+                type="primary"
+                icon="View"
+                @click="openViewDevice(scope.row)"
+                v-hasPermi="['system:user:remove']"
+                >查看</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-col>
+    </el-row>
+    <device-dialog
+      ref="deviceRef"
+      :title="title"
+      :item="currentData"
+      @submit="getList()"
+    />
+    <device-view-dialog
+      ref="deviceViewRef"
+      :item="viewData"
+      :viewFlg="viewFlg"
+    />
+  </div>
+</template>
+
+<script setup name="Device">
+import {
+  getDeviceList,
+  stopDevice,
+  startDevice,
+  getDiseaseTreatmentInit,
+  getDeviceOne,
+} from "./components/device";
+import deviceDialog from "./components/deviceDialog";
+import deviceViewDialog from "./components/deviceViewDialog";
+import { nextTick } from "vue";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
+
+const deviceList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]); // 存储选择的行数据
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const deviceCategories = ref(undefined);
+const statusFlagOptions = ref(undefined);
+const exeOrganizations = ref(undefined);
+// 使用 ref 定义当前器材数据
+const currentData = ref({});
+// 使用 ref 定义当前查看器材数据
+const viewData = ref({});
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 50,
+    searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
+    typeEnum: undefined, // 类型（包括 1：中药，2：成药）
+    statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+    ybMatchFlag: undefined, // 是否医保匹配（包括 1：是，0：否）
+    ruleId: undefined, // 执行科室
+    categoryEnum: undefined, // 目录分类
+  },
+  rules: {
+    // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+    // conditionCode: [
+    //   { required: true, message: "编码不能为空", trigger: "blur" },
+    // ],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 通过条件过滤节点  */
+const filterNode = (value, data) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
+
+/** 病种目录分类查询下拉树结构 */
+function getDiseaseTreatmentList() {
+  getDiseaseTreatmentInit().then((response) => {
+    console.log(response, "response器材目录分类查询下拉树结构");
+    deviceCategories.value = response.data.deviceCategories;
+    statusFlagOptions.value = response.data.statusFlagOptions;
+    exeOrganizations.value = response.data.exeOrganizations;
+  });
+}
+/** 查询病种目录列表 */
+function getList() {
+  loading.value = true;
+  getDeviceList(queryParams.value).then((res) => {
+    loading.value = false;
+    deviceList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+/** 节点单击事件 */
+function handleNodeClick(data) {
+  queryParams.value.categoryEnum = data.id;
+  handleQuery();
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 启用按钮操作 */
+function handleStart() {
+  const stardIds =  ids.value;
+  //   selectedData
+  proxy.$modal
+    .confirm("是否确定启用数据！")
+    .then(function () {
+      return startDevice(stardIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("启用成功");
+    })
+    .catch(() => {});
+}
+/** 停用按钮操作 */
+function handleClose() {
+  const stopIds =  ids.value;
+  proxy.$modal
+    .confirm("是否确认停用数据！")
+    .then(function () {
+      return stopDevice(stopIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("停用成功");
+    })
+    .catch(() => {});
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    "system/user/export",
+    {
+      ...queryParams.value,
+    },
+    `user_${new Date().getTime()}.xlsx`
+  );
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  console.log(selection, "selection");
+  // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download(
+    "system/user/importTemplate",
+    {},
+    `user_template_${new Date().getTime()}.xlsx`
+  );
+}
+
+/** 打开新增弹窗 */
+function openAddDevice() {
+  console.log("打开新增弹窗");
+  title.value = "新增";
+  nextTick(() => {
+    proxy.$refs.deviceRef.show();
+  });
+}
+/** 打开编辑弹窗 */
+function openEditDevice(row) {
+  console.log("打开新增弹窗");
+  currentData.value = row;
+  console.log(currentData.value, "currentData");
+  title.value = "编辑";
+  // 确保子组件已经接收到最新的 props
+  nextTick(() => {
+    proxy.$refs["deviceRef"].edit();
+  });
+  // proxy.$refs["deviceRef"].edit();
+}
+/** 打开查看弹窗 */
+function openViewDevice(row) {
+  // viewData.value = row;
+  getDeviceOne(row.id).then((response) => {
+    currentData.value = response.data;
+    title.value = "查看";
+    nextTick(() => {
+      proxy.$refs["deviceRef"].edit();
+    });
+    getList();
+  });
+  // console.log(viewData.value, "currentData");
+  // // 确保子组件已经接收到最新的 props
+  // nextTick(() => {
+  //   proxy.$refs["deviceViewRef"].edit();
+  // });
+  // proxy.$refs["deviceRef"].edit();
+}
+
+
+getDiseaseTreatmentList();
+getList();
+</script>
+<style scoped>
+.el-form--inline .el-form-item {
+  display: inline-flex;
+  vertical-align: middle;
+  margin-right: 10px !important;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue
index 83c48d95..7629d794 100644
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -207,7 +207,7 @@
             label="停用"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             width="160"
           />
           <el-table-column
@@ -450,7 +450,7 @@ function handleExport() {
 function handleSelectionChange(selection) {
   console.log(selection, "selection");
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
-  ids.value = selection.map(item => item.userId);
+  ids.value = selection.map(item => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
index ec0123fb..c4a3cb0f 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
@@ -51,20 +51,3 @@ export function getMedicationCategory() {
     method: 'get'
   })
 }
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询部门下拉树结构
-export function deptTreeSelect() {
-  return request({
-    url: '/system/user/deptTree',
-    method: 'get'
-  })
-}
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
index 3a8d6bc8..ca703e7d 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -241,35 +241,35 @@
             label="单价"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="拆零价"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="拆零比"
             align="center"
             key="partPercent"
-            rop="partPercent"
+            prop="partPercent"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="组套标记"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="医保编码"
             align="center"
             key="ybNo"
-            rop="ybNo"
+            prop="ybNo"
             :show-overflow-tooltip="true"
           />
 
@@ -277,7 +277,7 @@
             label="医保已对码"
             align="center"
             key="ybMatchFlag"
-            rop="ybMatchFlag"
+            prop="ybMatchFlag"
             :show-overflow-tooltip="true"
             width="100"
           />
@@ -285,21 +285,21 @@
             label="医保等级"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="发票项目"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="限制使用标记"
             align="center"
             key="restrictedFlag"
-            rop="restrictedFlag"
+            prop="restrictedFlag"
             :show-overflow-tooltip="true"
             width="110"
           />
@@ -307,7 +307,7 @@
             label="限制使用范围"
             align="center"
             key="restrictedScope"
-            rop="restrictedScope"
+            prop="restrictedScope"
             :show-overflow-tooltip="true"
             width="110"
           />
@@ -315,14 +315,14 @@
             label="目录限价"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="病案结算项"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
             width="90"
           />
@@ -330,7 +330,7 @@
             label="已发生业务"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
             width="90"
           />
@@ -338,7 +338,7 @@
             label="确认可用标记"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
             width="110"
           />
@@ -346,14 +346,14 @@
             label="停用"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="取消批次号管理"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
             width="120"
           />
@@ -361,14 +361,14 @@
             label="用法煎法"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="剂量单位换算比"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
             width="120"
           />
@@ -376,14 +376,14 @@
             label="采购价"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="采购拆零价"
             align="center"
             key="statusEnum"
-            rop="statusEnum"
+            prop="statusEnum"
             :show-overflow-tooltip="true"
             width="90"
           />

From 8d4539bf833dddfa39d0abdef9f2ab1683afbef2 Mon Sep 17 00:00:00 2001
From: liuhongrui <liuhr@ccbjb.com.cn>
Date: Fri, 28 Feb 2025 09:45:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E7=B1=BB=E5=9E=8B=20=20=E6=94=B9=E4=B8=BA=20=20?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/openhis/administration/domain/Patient.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;