diff --git a/acupuncture-前台/.env.production b/acupuncture-前台/.env.production
index 0857b11d..54490c6f 100644
--- a/acupuncture-前台/.env.production
+++ b/acupuncture-前台/.env.production
@@ -4,12 +4,12 @@ VUE_APP_TITLE = 体重管理数据云平台系统
# 生产环境配置
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_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture_ays/api/'
# 访问地址
-VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/'
+VUE_APP_VISIT_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/'
# 筛查访问地址
-VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5'
+VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture_ays/clientssl/screening/h5'
# 访问路径
-VUE_APP_PUBLIC_PATH = '/acupuncture/client/'
+VUE_APP_PUBLIC_PATH = '/acupuncture_ays/clientssl/'
diff --git a/acupuncture-前台/src/api/medicalFile.js b/acupuncture-前台/src/api/medicalFile.js
index 860d27fc..0fc3ff89 100644
--- a/acupuncture-前台/src/api/medicalFile.js
+++ b/acupuncture-前台/src/api/medicalFile.js
@@ -72,6 +72,24 @@ export function selectReportByMemberId(data) {
data: data,
});
}
+// ------ 运动 ------
+
+// 体质测试类数据
+export function queryMotionInfo(data) {
+ return request({
+ url: "/http/queryMotionInfo",
+ method: "post",
+ data: data,
+ });
+}
+// 人体成分
+export function queryMotionTcfInfo(data) {
+ return request({
+ url: "/http/queryMotionTcfInfo",
+ method: "post",
+ data: data,
+ });
+}
// 评估报告单
export function exportTreatmentPg(data) {
return request({
diff --git a/acupuncture-前台/src/views/index.vue b/acupuncture-前台/src/views/index.vue
index f5752c9e..6dd24841 100644
--- a/acupuncture-前台/src/views/index.vue
+++ b/acupuncture-前台/src/views/index.vue
@@ -57,14 +57,14 @@ export default {
// firstAidTest().then((res) => {
// console.log(res);
// });
- const start = new Date();
- const end = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
- await setTimeout(async () => {
- await this.$refs.patient.statistics([start, end], 4);
- await this.$refs.JM.statistics([start, end], 4);
- await this.$refs.XGZL.statistics([start, end], 4);
- });
+ // const start = new Date();
+ // const end = new Date();
+ // start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ // await setTimeout(async () => {
+ // await this.$refs.patient.statistics([start, end], 4);
+ // await this.$refs.JM.statistics([start, end], 4);
+ // await this.$refs.XGZL.statistics([start, end], 4);
+ // });
},
methods: {
resize() {
diff --git a/acupuncture-前台/src/views/medicalFile/details.vue b/acupuncture-前台/src/views/medicalFile/details.vue
index e9f54daa..a0f3e199 100644
--- a/acupuncture-前台/src/views/medicalFile/details.vue
+++ b/acupuncture-前台/src/views/medicalFile/details.vue
@@ -85,7 +85,7 @@
@@ -769,6 +911,8 @@ import {
selectReportByMemberId,
zytzQrcode,
evaResult,
+ queryMotionInfo,
+ queryMotionTcfInfo,
} from "@/api/medicalFile";
import { followupQuery } from "@/api/followupFile";
// 体态评估
@@ -1265,6 +1409,25 @@ export default {
ZLFA_YW_QT: "", // 其他-药物治疗
SFDL: [], //随访队列
+ // 运动
+ WOLI: "", //握力
+ FHL: "", //肺活量
+ ZT: "", //纵跳
+ FWC: "", // 俯卧撑
+ YWQZ: "", // 仰卧起坐
+ TQQ: "", // 体前屈
+ BYDJ: "", // 闭眼单脚站立
+ FYS: "", // 反应时
+ BIKE: "", // 功率自行车
+ GTT: "", // 2分钟原地高抬腿
+ ZZ: "", // 30秒坐站
+ LT: "", // 立定跳远
+ LXT: "", // 双脚连续跳
+ ZA: "", // 15米绕障碍跑
+ PHM: "", // 走平衡木
+ BMI: "", //BMI
+ PBF: "", //体脂率
+ Score: "", //体测总分
}, // 档案详情表单
qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
selectReportUrl: "",
@@ -1319,25 +1482,61 @@ export default {
}
return matches;
},
- // 人体成分报告
- getHumanBodyReport() {
- selectReportByMemberId({
- memberId: this.form.visitNumber,
+ // 查询人体成分 - 安阳人体成分
+ getHumanBody() {
+ queryMotionTcfInfo({
+ memberId: this.form.memberId,
}).then((res) => {
- if (!res.data.id) {
- this.$modal.msgError("暂无报告");
+ if (!res.data) {
+ this.getHumanBody1(); // 调用新接口 - 针灸人体成分
+ // this.$modal.msgError("暂无数据");
return;
}
- this.humanBodyOpen = true;
- this.selectReportUrl = `${this.qzUrl}${res.data.fileName}`;
+ const {
+ weight, //体重
+ fat, //脂肪
+ bone, //骨质
+ protein, //蛋白质
+ water, //水分
+ muscle, //肌肉
+ smm, //骨骼肌
+ pbf, //体脂百分比
+ bmi, //体质指数
+ whr, //腰臀比(2位小数)
+ vfi, //内脏脂肪指数
+ bodyAge, //身体年龄
+ score, //健康评分
+ bodyType, //体型判定
+ lbm, //瘦体重(去脂体重)
+ } = res.data.data;
+
+ console.log("人体成分", res.data.data);
+
+ this.detailsForm.PG_RTCF_TZ = weight; // 体重
+ this.detailsForm.PG_RTCF_QZTZ = lbm; // 去脂体重
+ this.detailsForm.PG_RTCF_JRL = muscle; // 肌肉量
+ this.detailsForm.PG_RTCF_TBW = water; // 总水分(TBW)
+ this.detailsForm.PG_RTCF_DBZ = protein; // 蛋白质
+ this.detailsForm.PG_RTCF_GZ = bone; // 骨质量(GZ)
+ this.detailsForm.PG_RTCF_ZF = fat; // 脂肪
+ this.detailsForm.PG_RTCF_PBF = pbf; // 体脂百分比
+ this.detailsForm.PG_RTCF_GGJ = smm; //骨骼肌
+ this.detailsForm.PG_RTCF_BMI = bmi; // 体质指数(BMI)
+ this.detailsForm.PG_RTCF_WHR = whr; // 腰臀比(WHR)
+ this.detailsForm.PG_RTCF_NZZFSP = vfi; // 内脏脂肪水平
+ // this.detailsForm.PG_RTCF_STGCFBFB = ""; // 身体各成分百分比
+ this.detailsForm.PG_RTCF_TXLX = bodyType; // 体型类型
+ this.detailsForm.PG_RTCF_STNL = bodyAge; // 身体年龄
+ this.detailsForm.PG_RTCF_JKPF = score; // 健康评分
+ this.$modal.msgSuccess("同步成功");
});
},
- // 查询人体成分
- getHumanBody() {
+ // 查询人体成分 - 针灸人体成分
+ getHumanBody1() {
selectByMemberId({
id: this.form.id,
}).then((res) => {
- if (!res.data.id) {
+ if (!res.data?.id) {
this.$modal.msgError("暂无数据");
return;
}
@@ -1380,6 +1579,21 @@ export default {
this.detailsForm.PG_RTCF_JKPF = score; // 健康评分
});
},
+ // 运动运动功能测试与评估
+ getMotionInfo() {
+ queryMotionInfo({
+ memberId: this.form.memberId,
+ }).then((res) => {
+ if (!res.data) {
+ this.$modal.msgError("暂无数据");
+ return;
+ }
+ res.data.data.forEach((item) => {
+ this.detailsForm[item.Item] = item.Value;
+ });
+ this.$modal.msgSuccess("同步成功");
+ });
+ },
// 判断是否显示诊疗方法
getzzffShow(_title) {
const { JBXX_ZYZD, JBXX_ZYZD_QT } = this.detailsForm;
@@ -1529,6 +1743,25 @@ export default {
ZLFA_YW_QT: "", // 其他-药物治疗
SFDL: [], //随访队列
+ // 运动
+ WOLI: "", //握力
+ FHL: "", //肺活量
+ ZT: "", //纵跳
+ FWC: "", // 俯卧撑
+ YWQZ: "", // 仰卧起坐
+ TQQ: "", // 体前屈
+ BYDJ: "", // 闭眼单脚站立
+ FYS: "", // 反应时
+ BIKE: "", // 功率自行车
+ GTT: "", // 2分钟原地高抬腿
+ ZZ: "", // 30秒坐站
+ LT: "", // 立定跳远
+ LXT: "", // 双脚连续跳
+ ZA: "", // 15米绕障碍跑
+ PHM: "", // 走平衡木
+ BMI: "", //BMI
+ PBF: "", //体脂率
+ Score: "", //体测总分
};
},
diff --git a/acupuncture-前台/src/views/medicalFile/index.vue b/acupuncture-前台/src/views/medicalFile/index.vue
index a96c191d..9f28eb8f 100644
--- a/acupuncture-前台/src/views/medicalFile/index.vue
+++ b/acupuncture-前台/src/views/medicalFile/index.vue
@@ -980,9 +980,16 @@ export default {
let patientInfo;
if (this.$route.query.patientInfo) {
this.form = JSON.parse(this.$route.query.patientInfo);
+ this.form = {
+ ...JSON.parse(this.$route.query.patientInfo),
+ visitType: 0, // 门诊/住院
+ visitNumber: "", // 门诊/住院号
+ visitTime: "", // 门诊/住院时间
+ dischargeTime: "", // 出院时间
+ doctor: "", // 责任医生
+ status: 0, // 保存
+ };
delete this.form.id;
- this.form.visitType = 0; // 门诊/住院
- this.form.status = 0; // 保存
this.open = true;
}
this.getList();
diff --git a/acupuncture-前台/安阳针灸前台1.zip b/acupuncture-前台/安阳前台-1.zip
similarity index 90%
rename from acupuncture-前台/安阳针灸前台1.zip
rename to acupuncture-前台/安阳前台-1.zip
index 037570e0..c086df0d 100644
Binary files a/acupuncture-前台/安阳针灸前台1.zip and b/acupuncture-前台/安阳前台-1.zip differ
diff --git a/acupuncture-前台/针灸前台-4.zip b/acupuncture-前台/安阳前台-2.zip
similarity index 90%
rename from acupuncture-前台/针灸前台-4.zip
rename to acupuncture-前台/安阳前台-2.zip
index 6bbff173..f98992c2 100644
Binary files a/acupuncture-前台/针灸前台-4.zip and b/acupuncture-前台/安阳前台-2.zip differ
diff --git a/acupuncture-前台/针灸前台-1.zip b/acupuncture-前台/针灸前台-1.zip
deleted file mode 100644
index e698e742..00000000
Binary files a/acupuncture-前台/针灸前台-1.zip and /dev/null differ
diff --git a/acupuncture-前台/针灸前台-2.zip b/acupuncture-前台/针灸前台-2.zip
deleted file mode 100644
index c9d2714b..00000000
Binary files a/acupuncture-前台/针灸前台-2.zip and /dev/null differ
diff --git a/acupuncture-前台/针灸前台-3.zip b/acupuncture-前台/针灸前台-3.zip
deleted file mode 100644
index 9b1103ba..00000000
Binary files a/acupuncture-前台/针灸前台-3.zip and /dev/null differ
diff --git a/acupuncture-后台/src/views/medicalFile/details.vue b/acupuncture-后台/src/views/medicalFile/details.vue
index 7eef2140..af5915fc 100644
--- a/acupuncture-后台/src/views/medicalFile/details.vue
+++ b/acupuncture-后台/src/views/medicalFile/details.vue
@@ -83,7 +83,7 @@
病情评估
- 人体成分分析
+ 人体成分
+