From 298321dc374ec3727fd55cf9af18006cdfb15673 Mon Sep 17 00:00:00 2001
From: liuzhipeng <1747191978@qq.com>
Date: Sun, 6 Apr 2025 08:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E6=A1=A3=E6=A1=88=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=A2=9E=E8=AF=8A=E7=96=97=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=8A=E7=96=97=E6=A1=A3=E6=A1=88url=E6=90=BA?=
 =?UTF-8?q?=E5=B8=A6=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8D=E6=97=8F=E5=8F=97=E6=95=99=E8=82=B2=E7=A8=8B=E5=BA=A6?=
 =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/medicalFile/index.vue           | 16 +++++++++++++---
 .../src/views/patientFile/index.vue           | 19 ++++++++++++++++---
 package-lock.json                             |  2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/acupuncture-前台/src/views/medicalFile/index.vue b/acupuncture-前台/src/views/medicalFile/index.vue
index d494d045..9de52891 100644
--- a/acupuncture-前台/src/views/medicalFile/index.vue
+++ b/acupuncture-前台/src/views/medicalFile/index.vue
@@ -478,7 +478,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="民族" prop="ethnicity">
+        <el-form-item label="民族" prop="">
           <el-select v-model="form.ethnicity" placeholder="请选择" filterable>
             <el-option
               v-for="item in ethnicityList"
@@ -489,7 +489,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="受教育程度" prop="educationYears">
+        <el-form-item label="受教育程度" prop="">
           <el-select
             v-model="form.educationYears"
             placeholder="请选择"
@@ -954,8 +954,18 @@ export default {
     };
   },
   created() {
+    // 从url获取idCard
     let idCard = this.$route.query.idCard;
-    this.queryParams.param.keywords = idCard || "";
+    this.queryParams.param.keywords = idCard;
+
+    let patientInfo;
+    if (this.$route.query.patientInfo) {
+      this.form = JSON.parse(this.$route.query.patientInfo);
+      delete this.form.id;
+      this.form.visitType = 0; // 门诊/住院
+      this.form.status = 0; // 保存
+      this.open = true;
+    }
     this.getList();
     this.userInfo = JSON.parse(localStorage.getItem("user"));
     // this.getFollowupQuery();
diff --git a/acupuncture-前台/src/views/patientFile/index.vue b/acupuncture-前台/src/views/patientFile/index.vue
index 9b068729..02014844 100644
--- a/acupuncture-前台/src/views/patientFile/index.vue
+++ b/acupuncture-前台/src/views/patientFile/index.vue
@@ -239,7 +239,7 @@
         align="center"
         prop="source"
         show-overflow-tooltip
-        min-width="100"
+        min-width="80"
       >
         <template slot-scope="scope">
           <span v-if="scope.row.source == 0">筛查</span>
@@ -247,7 +247,7 @@
           <span v-if="scope.row.source == 2">HIS</span>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center" width="150">
+      <el-table-column fixed="right" label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -277,6 +277,13 @@
             @click="handleArchives(scope.row)"
             >诊疗档案</el-button
           >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleArchivesAdd(scope.row)"
+            >新增诊疗档案
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -817,7 +824,13 @@ export default {
     /** 诊疗档案 */
     handleArchives(row) {
       this.$router.push({
-        path: `/medicalIndex?idCard=${row.idCard}`,
+        path: `/medicalIndex?idCard=${row.idCard || ""}`,
+      });
+    },
+    /** 新增诊疗档案 */
+    handleArchivesAdd(row) {
+      this.$router.push({
+        path: `/medicalIndex?patientInfo=${JSON.stringify(row)}`,
       });
     },
     /** 提交按钮 */
diff --git a/package-lock.json b/package-lock.json
index 1208ee99..35a569c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "针灸",
+  "name": "acupuncture",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {}