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 01/14] =?UTF-8?q?=E6=82=A3=E8=80=85=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E8=AF=8A=E7=96=97=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=EF=BC=8C=E8=AF=8A=E7=96=97=E6=A1=A3=E6=A1=88url?= =?UTF-8?q?=E6=90=BA=E5=B8=A6=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=EF=BC=8C=E5=90=8D=E6=97=8F=E5=8F=97=E6=95=99=E8=82=B2=E7=A8=8B?= =?UTF-8?q?=E5=BA=A6=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 @@ > - + - + - + @@ -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": {} From 7cff9c7ea9348aae52094071632af4992d030ba5 Mon Sep 17 00:00:00 2001 From: liuzhipeng <1747191978@qq.com> Date: Sun, 6 Apr 2025 08:49:37 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acupuncture-前台/.env.development | 6 +- acupuncture-前台/.env.production | 3 + acupuncture-前台/.env.productions | 3 + acupuncture-前台/src/permission.js | 1 + acupuncture-前台/src/router/index.js | 7 + .../src/views/medicalFile/details.vue | 14 +- .../src/views/medicalFile/h5eva.vue | 1102 +++++++++++++++++ 7 files changed, 1134 insertions(+), 2 deletions(-) create mode 100644 acupuncture-前台/src/views/medicalFile/h5eva.vue diff --git a/acupuncture-前台/.env.development b/acupuncture-前台/.env.development index 14589f3a..7474bc60 100644 --- a/acupuncture-前台/.env.development +++ b/acupuncture-前台/.env.development @@ -8,8 +8,12 @@ ENV = 'development' VUE_APP_BASE_API = '/dev-api' VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture/api/' VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/' + +# 访问地址 +VUE_APP_VISIT_URL = 'https://test.tall.wiki/acupuncture/client/' # 筛查访问地址 -VUE_APP_H5_URL = 'https://test.tall.wiki//acupuncture/client/screening/h5' +VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture/client/screening/h5' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true # 访问路径 diff --git a/acupuncture-前台/.env.production b/acupuncture-前台/.env.production index 92804d37..5b2869b3 100644 --- a/acupuncture-前台/.env.production +++ b/acupuncture-前台/.env.production @@ -6,6 +6,9 @@ NODE_ENV = 'production' # 因孚生产 VUE_APP_BASE_API = 'http://113.45.159.249:40010/acupuncture/api/' VUE_APP_API_QZURL = 'http://113.45.159.249:40010/acupuncture/api/' + +# 访问地址 +VUE_APP_VISIT_URL = 'http://113.45.159.249:40010/acupuncture/client/' # 筛查访问地址 VUE_APP_H5_URL = 'http://113.45.159.249:40010/acupuncture/client/screening/h5' # 访问路径 diff --git a/acupuncture-前台/.env.productions b/acupuncture-前台/.env.productions index 2303e6b7..756b3f5c 100644 --- a/acupuncture-前台/.env.productions +++ b/acupuncture-前台/.env.productions @@ -6,6 +6,9 @@ NODE_ENV = 'production' # 因孚生产 VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture/api/' VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture/api/' + +# 访问地址 +VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/' # 筛查访问地址 VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5' # 访问路径 diff --git a/acupuncture-前台/src/permission.js b/acupuncture-前台/src/permission.js index b6838e3d..566be800 100644 --- a/acupuncture-前台/src/permission.js +++ b/acupuncture-前台/src/permission.js @@ -15,6 +15,7 @@ const whiteList = [ "/screening/h5", "/screening/h5eva", "/screening/h5Result", + "/medicalEva" ]; const isWhiteList = (path) => { diff --git a/acupuncture-前台/src/router/index.js b/acupuncture-前台/src/router/index.js index a15000e2..4c72c023 100644 --- a/acupuncture-前台/src/router/index.js +++ b/acupuncture-前台/src/router/index.js @@ -105,6 +105,7 @@ export const constantRoutes = [ hidden: true, meta: { title: "诊疗信息", icon: "dashboard" }, }, + ], }, { @@ -182,6 +183,12 @@ export const constantRoutes = [ component: () => import("@/views/screening/h5Result.vue"), hidden: true, }, + { + path: "/medicalEva", + component: () => import("@/views/medicalFile/h5eva"), + name: "medicalEva", + hidden: true, + } ]; // 动态路由，基于用户权限动态去加载 diff --git a/acupuncture-前台/src/views/medicalFile/details.vue b/acupuncture-前台/src/views/medicalFile/details.vue index 3d4f4401..d3f8b9c2 100644 --- a/acupuncture-前台/src/views/medicalFile/details.vue +++ b/acupuncture-前台/src/views/medicalFile/details.vue @@ -194,6 +194,7 @@ > @@ -216,7 +217,11 @@
-
中医体质辨识
+
+ 中医体质辨识 + 二维码 + 同步 +
+
+
{{ tenantName || "-" }}
+ + +
+
基本信息
+
+ + + + + + + + + + 男 + 女 + + + + + + + + + + + + + + + + + + + + + + + + {{ form["SCWJ-JL"] || "-" }} + + +
+
+ +
+
睡眠质量评估
+ + + + + + + + + + + + + + + {{ form["SCWJ-SMXL"] || "-" }}% + + +
+ + + + + + +
+ + 提交 + +
+
+ + + + + + From 32f21db6b63ec0205769e73da7ac4493c7a745b0 Mon Sep 17 00:00:00 2001 From: liuzhipeng <1747191978@qq.com> Date: Sun, 6 Apr 2025 10:24:36 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=B8=AD=E5=8C=BB=E4=BD=93=E8=B4=A8?= =?UTF-8?q?=E8=BE=A8=E8=AF=86=E6=B5=8B=E8=AF=84=E9=A1=B5=EF=BC=8C=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acupuncture-前台/src/api/medicalFile.js | 40 + acupuncture-前台/src/permission.js | 3 +- acupuncture-前台/src/router/index.js | 6 + .../src/views/medicalFile/details.vue | 2 +- .../src/views/medicalFile/h5Result.vue | 119 + .../src/views/medicalFile/h5eva.vue | 2423 +++++++++++------ 6 files changed, 1720 insertions(+), 873 deletions(-) create mode 100644 acupuncture-前台/src/views/medicalFile/h5Result.vue diff --git a/acupuncture-前台/src/api/medicalFile.js b/acupuncture-前台/src/api/medicalFile.js index 88498e12..744b1240 100644 --- a/acupuncture-前台/src/api/medicalFile.js +++ b/acupuncture-前台/src/api/medicalFile.js @@ -80,3 +80,43 @@ export function exportTreatmentPg(data) { data: data, }); } +// 中医体质辩识 +export function evaSave(data) { + return request({ + url: "/medical/api/admin/eva/save", + method: "post", + data: data, + }); +} +// 测评试题列表 +export function evaTestList(data) { + return request({ + url: "/medical/api/admin/eva/questions/list", + method: "post", + data: data, + }); +} +// 测评试题列表 +export function evaTestSubmit(data) { + return request({ + url: "/eva/questions/submit", + method: "post", + data: data, + }); +} +// 完成测评 +export function evaComplete(data) { + return request({ + url: "/medical/api/admin/eva/complete", + method: "post", + data: data, + }); +} +// 完成测评 +export function evaResult(data) { + return request({ + url: "/medical/api/admin/report/view", + method: "post", + data: data, + }); +} \ No newline at end of file diff --git a/acupuncture-前台/src/permission.js b/acupuncture-前台/src/permission.js index 566be800..bc4725bf 100644 --- a/acupuncture-前台/src/permission.js +++ b/acupuncture-前台/src/permission.js @@ -15,7 +15,8 @@ const whiteList = [ "/screening/h5", "/screening/h5eva", "/screening/h5Result", - "/medicalEva" + "/medicalEva", + '/medicalResult' ]; const isWhiteList = (path) => { diff --git a/acupuncture-前台/src/router/index.js b/acupuncture-前台/src/router/index.js index 4c72c023..e0e879eb 100644 --- a/acupuncture-前台/src/router/index.js +++ b/acupuncture-前台/src/router/index.js @@ -188,6 +188,12 @@ export const constantRoutes = [ component: () => import("@/views/medicalFile/h5eva"), name: "medicalEva", hidden: true, + }, + { + path: "/medicalResult", + component: () => import("@/views/medicalFile/h5Result"), + name: "medicalEva", + hidden: true, } ]; diff --git a/acupuncture-前台/src/views/medicalFile/details.vue b/acupuncture-前台/src/views/medicalFile/details.vue index d3f8b9c2..d0c32ff9 100644 --- a/acupuncture-前台/src/views/medicalFile/details.vue +++ b/acupuncture-前台/src/views/medicalFile/details.vue @@ -1223,7 +1223,7 @@ export default { methods: { // 中医体质辨识测评二维码 getEvaQr() { - `${process.env.VUE_APP_VISIT_URL}medicalEva?id=${this.form.visitNumber}&name=${this.form.name}&phone=${this.form.phone}`; + `${process.env.VUE_APP_VISIT_URL}medicalEva?id=${this.form.id}&name=${this.form.name}&phone=${this.form.phone}`; window.location.href = `${process.env.VUE_APP_VISIT_URL}medicalEva?id=${this.form.visitNumber}&name=${this.form.name}&phone=${this.form.phone}`; }, // 中医体质辨识测评结果同步 diff --git a/acupuncture-前台/src/views/medicalFile/h5Result.vue b/acupuncture-前台/src/views/medicalFile/h5Result.vue new file mode 100644 index 00000000..ba658c10 --- /dev/null +++ b/acupuncture-前台/src/views/medicalFile/h5Result.vue @@ -0,0 +1,119 @@ + + + + + + diff --git a/acupuncture-前台/src/views/medicalFile/h5eva.vue b/acupuncture-前台/src/views/medicalFile/h5eva.vue index 8cfb23b1..51faeb65 100644 --- a/acupuncture-前台/src/views/medicalFile/h5eva.vue +++ b/acupuncture-前台/src/views/medicalFile/h5eva.vue @@ -1,274 +1,45 @@