diff --git a/acupuncture-前台/src/api/medicalFile.js b/acupuncture-前台/src/api/medicalFile.js
index 744b1240..860d27fc 100644
--- a/acupuncture-前台/src/api/medicalFile.js
+++ b/acupuncture-前台/src/api/medicalFile.js
@@ -80,26 +80,29 @@ export function exportTreatmentPg(data) {
data: data,
});
}
-// 中医体质辩识
-export function evaSave(data) {
+
+// ------ 中医体质辩识 ------
+// 查询二维码
+export function zytzQrcode(data) {
return request({
- url: "/medical/api/admin/eva/save",
+ url: "zytz/qrcode",
method: "post",
data: data,
});
}
+
// 测评试题列表
export function evaTestList(data) {
return request({
- url: "/medical/api/admin/eva/questions/list",
+ url: "zytz/questions/list",
method: "post",
data: data,
});
}
-// 测评试题列表
+// 提交试题答案
export function evaTestSubmit(data) {
return request({
- url: "/eva/questions/submit",
+ url: "zytz/questions/submit",
method: "post",
data: data,
});
@@ -107,16 +110,16 @@ export function evaTestSubmit(data) {
// 完成测评
export function evaComplete(data) {
return request({
- url: "/medical/api/admin/eva/complete",
+ url: "zytz/eva/complete",
method: "post",
data: data,
});
}
-// 完成测评
+// 测评结果
export function evaResult(data) {
return request({
- url: "/medical/api/admin/report/view",
+ url: "zytz/report/view",
method: "post",
data: data,
});
-}
\ No newline at end of file
+}
diff --git a/acupuncture-前台/src/utils/request.js b/acupuncture-前台/src/utils/request.js
index b013aa08..0d8aeaa6 100644
--- a/acupuncture-前台/src/utils/request.js
+++ b/acupuncture-前台/src/utils/request.js
@@ -37,6 +37,10 @@ service.interceptors.request.use(
"screening/save",
"screening/submitNoToken",
"screening/queryDetailNoToken",
+ "zytz/questions/list",
+ "zytz/questions/submit",
+ "zytz/eva/complete",
+ "zytz/report/view",
];
// console.log("config.url", config.url);
diff --git a/acupuncture-前台/src/views/medicalFile/details.vue b/acupuncture-前台/src/views/medicalFile/details.vue
index d0c32ff9..095c1e14 100644
--- a/acupuncture-前台/src/views/medicalFile/details.vue
+++ b/acupuncture-前台/src/views/medicalFile/details.vue
@@ -705,6 +705,17 @@
>
![]()
+
@@ -714,6 +725,7 @@ import {
saveAidRecord,
selectByMemberId,
selectReportByMemberId,
+ zytzQrcode,
} from "@/api/medicalFile";
import { followupQuery } from "@/api/followupFile";
// 体态评估
@@ -741,6 +753,9 @@ export default {
},
data() {
return {
+ userInfo: {}, // 用户信息
+ zytzOpen: false,
+ pathUrl: "",
followupList: [],
title: "", // 弹出框标题
open: false, // 是否显示弹出框
@@ -1219,15 +1234,44 @@ export default {
this.treatmentId = treatmentId;
this.handleDetails(treatmentId);
this.getFollowupQuery(); // 获取随访队列信息
+
+ this.userInfo = JSON.parse(localStorage.getItem("user"));
},
methods: {
// 中医体质辨识测评二维码
getEvaQr() {
- `${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}`;
+ zytzQrcode({
+ param: {
+ id: this.form.id,
+ rewrite: 1,
+ path: `${"http://localhost:80/"}medicalEva?id=${this.form.id}&name=${
+ this.form.name
+ }&phone=${this.form.phone}&tenantId=${this.userInfo.tenantId}`,
+ },
+ }).then((res) => {
+ this.zytzOpen = true;
+ this.pathUrl = this.qzUrl + res.data;
+ });
},
// 中医体质辨识测评结果同步
- getEvaTb() {},
+ getEvaTb() {
+ const comment =
+ "【特禀质】、【气虚质】、【血瘀质】、【气郁质】、倾向是【阳虚质】、倾向是【痰湿质】";
+ const constitutionTypes = this.extractConstitutionTypes(comment);
+ // this.detailsForm.PG_TZBS_ZYTZ = "气虚质"; // 主要体质
+ this.detailsForm.PG_TZBS_JJTZ = constitutionTypes; // 兼夹体质
+
+ console.log(constitutionTypes);
+ },
+ extractConstitutionTypes(comment) {
+ const regex = /【(.*?)】/g;
+ const matches = [];
+ let match;
+ while ((match = regex.exec(comment)) !== null) {
+ matches.push(match[1]);
+ }
+ return matches;
+ },
// 人体成分报告
getHumanBodyReport() {
selectReportByMemberId({
diff --git a/acupuncture-前台/src/views/medicalFile/h5Result.vue b/acupuncture-前台/src/views/medicalFile/h5Result.vue
index 0236a3b7..ba658c10 100644
--- a/acupuncture-前台/src/views/medicalFile/h5Result.vue
+++ b/acupuncture-前台/src/views/medicalFile/h5Result.vue
@@ -23,7 +23,7 @@ export default {
},
created() {
this.evaId = this.$route.query.evaId;
- // this.getEvaResult();
+ this.getEvaResult();
},
methods: {
getEvaResult() {
diff --git a/acupuncture-前台/src/views/medicalFile/h5eva.vue b/acupuncture-前台/src/views/medicalFile/h5eva.vue
index 89a46892..e03015d6 100644
--- a/acupuncture-前台/src/views/medicalFile/h5eva.vue
+++ b/acupuncture-前台/src/views/medicalFile/h5eva.vue
@@ -47,1536 +47,46 @@