From 03f5d26d4eba7da4a90a11b0a91ab7a5cc6f87a6 Mon Sep 17 00:00:00 2001
From: liuzhipeng <1747191978@qq.com>
Date: Sat, 15 Feb 2025 20:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E9=98=9F=E5=88=97=EF=BC=8C?=
 =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E5=AF=B9=E8=B1=A1=E9=A1=B5=E9=9D=A2=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/followFile/subjects.vue         |   4 +-
 .../src/views/medicalFile/index.vue           | 101 +++++++++++++++---
 2 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/acupuncture-ui/src/views/followFile/subjects.vue b/acupuncture-ui/src/views/followFile/subjects.vue
index 56f1d0825..c8d83aa5f 100644
--- a/acupuncture-ui/src/views/followFile/subjects.vue
+++ b/acupuncture-ui/src/views/followFile/subjects.vue
@@ -261,8 +261,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        name: [
-          { required: true, message: "患者姓名不能为空", trigger: "blur" },
+        queueIdList: [
+          { required: true, message: "随访队列不能为空", trigger: "change" },
         ],
       },
       followupList: [], // 随访队列
diff --git a/acupuncture-ui/src/views/medicalFile/index.vue b/acupuncture-ui/src/views/medicalFile/index.vue
index c0a34c5ca..604127b68 100644
--- a/acupuncture-ui/src/views/medicalFile/index.vue
+++ b/acupuncture-ui/src/views/medicalFile/index.vue
@@ -169,7 +169,13 @@
       max-height="600"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="姓名" align="center" prop="name" width="100" />
+      <el-table-column
+        fixed
+        label="姓名"
+        align="center"
+        prop="name"
+        width="100"
+      />
       <el-table-column
         label="性别"
         align="center"
@@ -189,6 +195,27 @@
         show-overflow-tooltip
         width="80"
       />
+      <el-table-column
+        label="民族"
+        align="center"
+        prop="ethnicity"
+        show-overflow-tooltip
+        width="100"
+      />
+      <el-table-column
+        label="受教育年限"
+        align="center"
+        prop="educationYears"
+        show-overflow-tooltip
+        width="100"
+      />
+      <el-table-column
+        label="手机号码"
+        align="center"
+        prop="phone"
+        show-overflow-tooltip
+        width="150"
+      />
       <el-table-column
         label="证件类型"
         align="center"
@@ -228,17 +255,28 @@
       <el-table-column
         label="门诊时间/住院时间"
         align="center"
-        prop="visitTime"
         show-overflow-tooltip
-        width="180"
-      />
+        width="140"
+      >
+        <template slot-scope="scope">
+          <span>
+            {{ parseTime(scope.row.visitTime, "{y}-{m}-{d} {h}:{i}") }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="出院时间"
         align="center"
         prop="dischargeTime"
         show-overflow-tooltip
-        width="150"
-      />
+        width="140"
+      >
+        <template slot-scope="scope">
+          <span>
+            {{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d} {h}:{i}") }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="责任医生"
         align="center"
@@ -260,11 +298,11 @@
         show-overflow-tooltip
         width="100"
       />
-      <el-table-column label="建档时间" align="center" width="130">
+      <el-table-column label="建档时间" align="center" width="140">
         <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}")
-          }}</span>
+          <span>
+            {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column
@@ -371,7 +409,7 @@
             <el-radio :label="1">女</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="出生年月" prop="birthDate">
+        <el-form-item label="出生日期" prop="birthDate">
           <el-date-picker
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
@@ -384,6 +422,13 @@
         <el-form-item label="民族" prop="ethnicity">
           <el-input v-model="form.ethnicity" placeholder="请输入" />
         </el-form-item>
+        <el-form-item label="受教育年限" prop="educationYears">
+          <el-input
+            v-model="form.educationYears"
+            placeholder="请输入"
+            :disabled="formDisabled"
+          />
+        </el-form-item>
         <el-form-item label="手机号码" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入" />
         </el-form-item>
@@ -1376,7 +1421,7 @@ export default {
         visitType: [
           {
             required: true,
-            message: "不能为空",
+            message: "诊疗类型不能为空",
             trigger: "blur",
           },
         ],
@@ -1390,24 +1435,45 @@ export default {
         visitTime: [
           {
             required: true,
-            message: "门诊时间/住院时间",
-            trigger: "blur",
+            message: "门诊时间/住院时间不能为空",
+            trigger: "change",
           },
         ],
         dischargeTime: [
           {
             required: true,
-            message: "出院时间",
-            trigger: "blur",
+            message: "出院时间不能为空",
+            trigger: "change",
           },
         ],
         doctor: [
           {
             required: true,
-            message: "责任医生",
+            message: "责任医生不能为空",
+            trigger: "blur",
+          },
+        ],
+        educationYears: [
+          {
+            required: true,
+            message: "受教育年限不能为空",
             trigger: "blur",
           },
         ],
+        queueIdList: [
+          {
+            required: true,
+            message: "随访队列不能为空",
+            trigger: "change",
+          },
+        ],
+        birthDate: [
+          {
+            required: true,
+            message: "出生日期不能为空",
+            trigger: "change",
+          },
+        ],
       },
     };
   },
@@ -1490,6 +1556,7 @@ export default {
         dischargeTime: "",
         doctor: "",
         status: 0,
+        queueIdList: [],
       };
       this.resetForm("form");
     },