diff --git a/acupuncture-前台/.env.development b/acupuncture-前台/.env.development index 8b988891..ea275b89 100644 --- a/acupuncture-前台/.env.development +++ b/acupuncture-前台/.env.development @@ -8,6 +8,8 @@ ENV = 'development' VUE_APP_BASE_API = '/dev-api' VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture' VUE_APP_API_QZURL = 'https://test.tall.wiki/' +# 筛查访问地址 +VUE_APP_H5_URL = 'https://test.tall.wiki/acupunctureClient/screening/h5' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true # 访问路径 diff --git a/acupuncture-前台/.env.production b/acupuncture-前台/.env.production index 79e0cddc..e1bf3b66 100644 --- a/acupuncture-前台/.env.production +++ b/acupuncture-前台/.env.production @@ -6,6 +6,7 @@ NODE_ENV = 'production' # 因孚生产 VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture' VUE_APP_API_QZURL = 'https://test.tall.wiki/' - +# 筛查访问地址 +VUE_APP_H5_URL = 'https://test.tall.wiki/acupunctureClient/screening/h5' # 访问路径 VUE_APP_PUBLIC_PATH = '/acupunctureClient/' diff --git a/acupuncture-前台/src/api/member.js b/acupuncture-前台/src/api/member.js new file mode 100644 index 00000000..1233b5c3 --- /dev/null +++ b/acupuncture-前台/src/api/member.js @@ -0,0 +1,106 @@ +import request from "@/utils/request"; + +// 获取租户列表 +export function tenantsList(data) { + return request({ + url: "/tenants/list", + method: "post", + data: data, + }); +} +// 新增租户 +export function tenantsAdd(data) { + return request({ + url: "/tenants/add", + method: "post", + data: data, + }); +} +// 修改租户 +export function tenantsUpd(data) { + return request({ + url: "/tenants/upd", + method: "post", + data: data, + }); +} + +// 删除租户 +export function tenantsDel(data) { + return request({ + url: "/tenants/del", + method: "post", + data: data, + }); +} +// ------ 数据源 ------ +// 获取数据源列表 +export function dataSourcesList(data) { + return request({ + url: "/dataSources/list", + method: "post", + data: data, + }); +}// 新增数据源 +export function dataSourcesAdd(data) { + return request({ + url: "/dataSources/add", + method: "post", + data: data, + }); +} +// 修改数据源 +export function dataSourcesUpd(data) { + return request({ + url: "/dataSources/upd", + method: "post", + data: data, + }); +} +// 删除数据源 +export function dataSourcesDel(data) { + return request({ + url: "/dataSources/del", + method: "post", + data: data, + }); +} +// ------ 用户 ------ +export function tenantUsersList(data) { + return request({ + url: "/tenantUsers/list", + method: "post", + data: data, + }); +}// 新增数据源 +export function tenantUsersAdd(data) { + return request({ + url: "/tenantUsers/add", + method: "post", + data: data, + }); +} +// 修改数据源 +export function tenantUsersUpd(data) { + return request({ + url: "/tenantUsers/upd", + method: "post", + data: data, + }); +} +// 删除数据源 +export function tenantUsersDel(data) { + return request({ + url: "/tenantUsers/del", + method: "post", + data: data, + }); +} +// +export function resetPwd(data) { + return request({ + url: "/web/resetPwd", + method: "put", + data: data, + }); +} \ No newline at end of file diff --git a/acupuncture-前台/src/api/screening.js b/acupuncture-前台/src/api/screening.js new file mode 100644 index 00000000..734c61f3 --- /dev/null +++ b/acupuncture-前台/src/api/screening.js @@ -0,0 +1,77 @@ +import request from "@/utils/request"; +// ------ 筛查上报相关接口 ------ +// 通过组织id查询医院信息 +export function queryHospitalNoToken(data) { + return request({ + url: "web/queryTenantById", + method: "post", + data: data, + }); +} +// 创建筛查 +export function create(data) { + return request({ + url: "screening/createNoToken", + method: "post", + data: data, + }); +} +// 通过code提交数据 +export function screenSave(data) { + return request({ + url: "screening/save", + method: "post", + data: data, + }); +} +// 提交筛查上报数据 +export function screenSubmit(data) { + return request({ + url: "screening/submitNoToken", + method: "post", + data: data, + }); +} + +// ------ 筛查二维码相关接口 ------ +// 筛查二维码 列表 +export function queryScreenList(data) { + return request({ + url: "/wxQrCode/queryScreenList", + method: "post", + data: data, + }); +} +// 添加筛查二维码 +export function addScreen(data) { + return request({ + url: "/wxQrCode/addScreen", + method: "post", + data: data, + }); +} +// 删除筛查二维码 +export function deleteScreen(data) { + return request({ + url: "/wxQrCode/deleteScreen", + method: "post", + data: data, + }); +} +// // 导出二维码 +export function exportQr(data) { + return request({ + url: "/wxQrCode/exportScreen", + method: "post", + data: data, + }); +} + +// ------ 筛查列表 ------ +export function queryDetail(data) { + return request({ + url: "/screening/queryDetail", + method: "post", + data: data, + }); +} diff --git a/acupuncture-前台/src/assets/images/idcard.png b/acupuncture-前台/src/assets/images/idcard.png new file mode 100644 index 00000000..806f29ff Binary files /dev/null and b/acupuncture-前台/src/assets/images/idcard.png differ diff --git a/acupuncture-前台/src/assets/images/screen.png b/acupuncture-前台/src/assets/images/screen.png new file mode 100644 index 00000000..7cb3ca33 Binary files /dev/null and b/acupuncture-前台/src/assets/images/screen.png differ diff --git a/acupuncture-前台/src/layout/components/Sidebar/SidebarItem.vue b/acupuncture-前台/src/layout/components/Sidebar/SidebarItem.vue index f92db6a2..0eba0e98 100644 --- a/acupuncture-前台/src/layout/components/Sidebar/SidebarItem.vue +++ b/acupuncture-前台/src/layout/components/Sidebar/SidebarItem.vue @@ -96,6 +96,7 @@ export default { 患者档案: require("@/assets/images/dangan_n@1x.png"), 诊疗档案: require("@/assets/images/zhenliao_n@1x.png"), 随访档案: require("@/assets/images/suifang_n@1x.png"), + 社区筛查: require("@/assets/images/screen.png"), 我的: require("@/assets/images/me_n@1x.png"), }, itmeIcon1: { @@ -103,6 +104,7 @@ export default { 患者档案: require("@/assets/images/dangan_s@1x.png"), 诊疗档案: require("@/assets/images/zhenliao_s@1x.png"), 随访档案: require("@/assets/images/suifang_s@1x.png"), + 社区筛查: require("@/assets/images/screen.png"), 我的: require("@/assets/images/me_s@1x.png"), }, }; @@ -151,6 +153,11 @@ export default { }; + + diff --git a/acupuncture-前台/src/views/medicalFile/components/posture/TAPS.png b/acupuncture-前台/src/views/medicalFile/components/posture/TAPS.png new file mode 100644 index 00000000..e9f9e47a Binary files /dev/null and b/acupuncture-前台/src/views/medicalFile/components/posture/TAPS.png differ diff --git a/acupuncture-前台/src/views/medicalFile/components/posture/TAPS.vue b/acupuncture-前台/src/views/medicalFile/components/posture/TAPS.vue new file mode 100644 index 00000000..f497eb01 --- /dev/null +++ b/acupuncture-前台/src/views/medicalFile/components/posture/TAPS.vue @@ -0,0 +1,146 @@ + + + + + + diff --git a/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue b/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue new file mode 100644 index 00000000..435ae930 --- /dev/null +++ b/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue @@ -0,0 +1,146 @@ + + + + + + diff --git a/acupuncture-前台/src/views/medicalFile/details.vue b/acupuncture-前台/src/views/medicalFile/details.vue index 03a2eecf..182cd919 100644 --- a/acupuncture-前台/src/views/medicalFile/details.vue +++ b/acupuncture-前台/src/views/medicalFile/details.vue @@ -4,414 +4,564 @@
- {{ item }} + {{ item }}
-
- -
基本信息
-
- - {{ - form.name - }} - - {{ form.gender == 0 ? "男" : "女" }} - - - {{ form.age }} - - - {{ form.phone }} - - - {{ form.visitNumber }} - - - {{ form.visitTime }} - - - {{ form.doctor }} - - - {{ form.createBy }} - - - {{ form.createTime }} - - -
+
+ + +
基本信息
+
+ + {{ + form.name + }} + + {{ form.gender == 0 ? "男" : "女" }} + + + {{ form.age }} + + + {{ form.phone }} + + + {{ form.visitNumber }} + + + {{ form.visitTime }} + + + {{ form.doctor }} + + + {{ form.createBy }} + + + {{ form.createTime }} + + + {{ + status[form.status] + }} + + +
+ - -
主要诊断
- - - - - - - -
- -
评估信息
-
人体成分（基本参数）
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
中医体质辨识
-
主要体质
-
- - - - - - -
兼夹体质
- - + + + +
主要诊断
+ + + -
- - -
-
体态评估
+ + + +
+ +
病情评估
+
人体成分
+
- - - + - - + - - + -
-
失眠评估
-
- - + - - + - - + -
-
焦虑评估
-
- - + + + + - - + + + + + + +
-
- -
治疗类型
- - - - - - - -
- 诊疗方法 -
-
-
{{ i.title }}
-
-
-
{{ j.title }}
- + + +
中医体质辨识
+
+ + - {{ k.value || k.title }} - -
- - - + + + + + +
+ + + +
+ +
+ + + + +
+
量表评估
+
体态评估
+
+ + + + + + + + + + + + +
-
-
{{ j.title }}
-
-
- {{ k.title }} -
- 失眠评估
+
+ + + + + + + + + + + + +
+
焦虑评估
+
+ + + + + + + + +
+
+ + + + +
治疗类型
+ + + + + + + + + + + +
+ 诊疗方法 +
+
+
{{ i.title }}
+
+
+
{{ j.title }}
+ - {{ l.value || l.title }} - -
- - + + + + +
+ +
+
+
{{ j.title }}
+
+
+ {{ k.title }} +
+ + {{ p.value || p.title }} + + + + +
+ + + +
+
+
-
- -
- -
治疗效果
-
- - - - - - - - - + + + + + +
治疗效果
+
+ + + + + + + + +
+ + + + +
诊疗费用
- - + + @@ -419,8 +569,15 @@ - - + + @@ -428,8 +585,15 @@ - - + + @@ -437,8 +601,15 @@ - - + + @@ -446,10 +617,30 @@ -
+ + + + +
随访队列
+ + + + +
import { queryRecord, saveAidRecord } from "@/api/medicalFile"; +import { followupQuery } from "@/api/followupFile"; +// 体态评估 +import TAPS from "./components/posture/TAPS"; // TAPS体态自觉评估 +import TRACE from "./components/posture/TRACE"; // TRACE体态临床评估 +import SRS22 from "./components/posture/SRS22"; // SRS-22问卷评估 // 失眠评估 -import PHQ from "./components/posture/PHQ-9"; // 患者健康问卷（PHQ-9） -import epworth from "./components/posture/epworth"; // Epworth嗜睡评估 -import PSQI from "./components/posture/PSQI"; // 匹兹堡睡眠质量指数（PSQI） +import PHQ from "./components/insomnia/PHQ-9"; // 患者健康问卷（PHQ-9） +import epworth from "./components/insomnia/epworth"; // Epworth嗜睡评估 +import PSQI from "./components/insomnia/PSQI"; // 匹兹堡睡眠质量指数（PSQI） // 焦虑评估 import HAMD24 from "./components/anxiety/HAMD"; // 汉密尔顿抑郁量表（HAMD-24） import SAS from "./components/anxiety/SAS"; // 焦虑自评量表 @@ -492,13 +688,28 @@ export default { PSQI, HAMD24, SAS, + TAPS, + TRACE, + SRS22, }, data() { return { + followupList: [], + title: "", // 弹出框标题 open: false, // 是否显示弹出框 + status: { + 0: "保存", + 1: "待审核", + 2: "通过", + 3: "驳回", + }, // 量表组件集合 component: { + // 体态评估 + PG_TT_TAPS_DF: "TAPS", + PG_TT_TRACE_DF: "TRACE", + PG_TT_SRS22_DF: "SRS22", // 失眠评估 "PG_SM_PHQ-9_DF": "PHQ", // 患者健康问卷（PHQ-9） PG_SM_EPSW_DF: "epworth", // Epworth嗜睡评估 @@ -513,13 +724,12 @@ export default { stepArr: [ "基本信息", "主要诊断", - "人体成分（基本参数）", - "中医体质辨识", - "评估", + "病情评估", "治疗类型", "诊疗方法", "治疗效果", "诊疗费用", + "随访队列", ], // 现病史 medicalHistory: [ @@ -633,23 +843,23 @@ export default { list: [ { title: "毫针/电针疗法", - type: "but", + type: "checkout", }, { title: "温针疗法", - type: "but", + type: "checkout", }, { title: "耳穴贴压疗法", - type: "but", + type: "checkout", }, { title: "穴位埋针法", - type: "but", + type: "checkout", }, { title: "穴位埋线法", - type: "but", + type: "checkout", }, ], }, @@ -660,22 +870,22 @@ export default { { title: "神门：安神定志，改善睡眠质量", value: "神门", - type: "but", + type: "checkout", }, { title: "三阴交：调理脾胃，养血安神", value: "三阴交", - type: "but", + type: "checkout", }, { title: "百会：调节大脑功能，促进睡眠", value: "百会", - type: "but", + type: "checkout", }, { title: "安眠：直接作用于睡眠中枢，帮助入睡", value: "安眠", - type: "but", + type: "checkout", }, ], }, @@ -688,28 +898,28 @@ export default { { title: "奥利司他：通过抑制胃肠道脂肪酶，减少脂肪吸收", value: "奥利司他", - type: "but", + type: "checkout", }, { title: "利拉鲁肽：GLP-1受体激动剂，延缓胃排空，增加饱腹感", value: "利拉鲁肽", - type: "but", + type: "checkout", }, { title: "贝那鲁肽：GLP-1受体激动剂，作用机制与利拉鲁肽类似", value: "贝那鲁肽", - type: "but", + type: "checkout", }, { title: "司美格鲁肽：GLP-1受体激动剂，每周一次给药，减重效果显著", value: "司美格鲁肽", - type: "but", + type: "checkout", }, { title: "替尔泊肽：GLP-1受体激动剂，适用于肥胖症治疗", value: "替尔泊肽", - type: "but", + type: "checkout", }, ], }, @@ -775,23 +985,23 @@ export default { list: [ { title: "毫针/电针疗法", - type: "but", + type: "checkout", }, { title: "温针疗法", - type: "but", + type: "checkout", }, { title: "耳穴贴压疗法", - type: "but", + type: "checkout", }, { title: "穴位埋针法", - type: "but", + type: "checkout", }, { title: "穴位埋线法", - type: "but", + type: "checkout", }, ], }, @@ -802,22 +1012,22 @@ export default { { title: "神门：安神定志，改善睡眠质量", value: "神门", - type: "but", + type: "checkout", }, { title: "三阴交：调理脾胃，养血安神", value: "三阴交", - type: "but", + type: "checkout", }, { title: "百会：调节大脑功能，促进睡眠", value: "百会", - type: "but", + type: "checkout", }, { title: "安眠：直接作用于睡眠中枢，帮助入睡", value: "安眠", - type: "but", + type: "checkout", }, ], }, @@ -831,31 +1041,31 @@ export default { title: "苯二氮䓬受体激动剂（BZRAs）：艾司唑仑、阿普唑仑、劳拉西泮等", value: "苯二氮䓬受体激动剂（BZRAs）", - type: "but", + type: "checkout", }, { title: "非苯二氮䓬类药物（non-BZDs）：唑吡坦、扎来普隆、右佐匹克隆、佐匹克隆", value: "非苯二氮䓬类药物（non-BZDs）", - type: "but", + type: "checkout", }, { title: "褪黑素和褪黑素受体激动剂：调节生物钟，改善睡眠", value: "褪黑素和褪黑素受体激动剂", - type: "but", + type: "checkout", }, { title: "抗抑郁药物：具有镇静作用的抗抑郁药物，如曲唑酮、米氮平等，可用于失眠伴抑郁症状的患者", value: "抗抑郁药物", - type: "but", - }, - { - title: - "其他药物：选择性食欲素受体拮抗剂苏沃雷生，可用于改善睡眠质量", - value: "其他药物", - type: "but", + type: "checkout", }, + // { + // title: + // "其他药物：选择性食欲素受体拮抗剂苏沃雷生，可用于改善睡眠质量", + // value: "其他药物", + // type: "checkout", + // }, ], }, ], @@ -872,23 +1082,23 @@ export default { list: [ { title: "毫针/电针疗法", - type: "but", + type: "checkout", }, { title: "温针疗法", - type: "but", + type: "checkout", }, { title: "耳穴贴压疗法", - type: "but", + type: "checkout", }, { title: "穴位埋针法", - type: "but", + type: "checkout", }, { title: "穴位埋线法", - type: "but", + type: "checkout", }, ], }, @@ -950,19 +1160,22 @@ export default { ZLFA_ZLLX: "", //治疗方式 ZLFA_XWXLGY: "", // 行为心理干预 ZLFA_YDGY: "", //运动干预 - ZLFA_ZJ_LF: "", //针灸疗法-疗法 - ZLFA_ZJ_XW: "", //针灸疗法-穴位 - ZLFA_YW: "", //药物治疗 + ZLFA_ZJ_LF: [], //针灸疗法-疗法 + ZLFA_ZJ_XW: [], //针灸疗法-穴位 + ZLFA_YW: [], //药物治疗 ZLFA_SHXG: "", // 生活习惯 ZLFA_XLTS: "", //心理调适 ZLFA_LCYYZL: "", //临床用药治疗 - ZLFA_ZJ_LF_SMZ: "", // 失眠症-针灸疗法-疗法 - ZLFA_ZJ_XW_SMZ: "", // 失眠症-针灸疗法-穴位 - ZLFA_YW_SMZ: "", // 失眠症-药物治疗 - ZLFA_ZJ_LF_QT: "", // 其他-针灸疗法-疗法 + ZLFA_ZJ_LF_SMZ: [], // 失眠症-针灸疗法-疗法 + ZLFA_ZJ_XW_SMZ: [], // 失眠症-针灸疗法-穴位 + ZLFA_YW_SMZ: [], // 失眠症-药物治疗 + ZLFA_YW_SMZ_QT: "", // 失眠症-药物治疗-其他 + ZLFA_ZJ_LF_QT: [], // 其他-针灸疗法-疗法 ZLFA_ZJ_XW_QT: "", // 其他-针灸疗法-穴位 ZLFA_YW_QT: "", // 其他-药物治疗 + + SFDL: [], //随访队列 }, // 档案详情表单 }; }, @@ -971,8 +1184,46 @@ export default { let treatmentId = this.$route.query.treatmentId; this.treatmentId = treatmentId; this.handleDetails(treatmentId); + this.getFollowupQuery(); // 获取随访队列信息 }, methods: { + getzzffShow(_title) { + const { JBXX_ZYZD, JBXX_ZYZD_QT } = this.detailsForm; + if (_title == "肥胖症" && JBXX_ZYZD.includes("肥胖症")) { + return true; + } + if (_title == "失眠症" && JBXX_ZYZD.includes("失眠病")) { + return true; + } + if (_title == "其他") { + let flat = false; + JBXX_ZYZD.forEach((item) => { + if (item != "肥胖症" && item != "失眠病") { + flat = true; + } + }); + if (JBXX_ZYZD_QT) { + return true; + } + return flat; + } + return false; + }, + // 获取随访队列信息 + getFollowupQuery() { + followupQuery({ + pageNum: -1, + param: { + status: 1, + }, + }).then((res) => { + this.followupList = res.data.list; + let commonQueue = JSON.parse(localStorage.getItem("commonQueue")); + commonQueue?.forEach((i) => { + this.followupList.unshift(i); + }); + }); + }, // 获取子组件量表结果 getScaleResult(_scaleResult, _code) { this.detailsForm[_code] = String(_scaleResult); @@ -992,7 +1243,19 @@ export default { queryRecord({ treatmentId: treatmentId, }).then((res) => { - let arrList = ["JBXX_ZYZD", "PG_RTCF_TXLX", "PG_TZBS_JJTZ"]; + let arrList = [ + "JBXX_ZYZD", + "PG_RTCF_TXLX", + "PG_TZBS_JJTZ", + "SFDL", + "ZLFA_ZJ_LF", + "ZLFA_ZJ_XW", + "ZLFA_YW", + "ZLFA_ZJ_LF_SMZ", + "ZLFA_ZJ_XW_SMZ", + "ZLFA_YW_SMZ", + "ZLFA_ZJ_LF_QT", + ]; let recordValDict = res.data.recordValDict; for (let key in recordValDict) { if (arrList.includes(key)) { @@ -1013,7 +1276,10 @@ export default { }, // 诊疗方案点击 handleButClick(_item, _row) { - console.log(_item, _row); + // 待审核、通过状态下不允许修改 + if (this.form.status == 1 || this.form.status == 2) { + return; + } this.detailsForm[_item.valueCode] = _row.value || _row.title; }, getDetailsForm() { @@ -1049,19 +1315,22 @@ export default { ZLFA_ZLLX: "", //治疗方式 ZLFA_XWXLGY: "", // 行为心理干预 ZLFA_YDGY: "", //运动干预 - ZLFA_ZJ_LF: "", //针灸疗法-疗法 - ZLFA_ZJ_XW: "", //针灸疗法-穴位 - ZLFA_YW: "", //药物治疗 + ZLFA_ZJ_LF: [], //针灸疗法-疗法 + ZLFA_ZJ_XW: [], //针灸疗法-穴位 + ZLFA_YW: [], //药物治疗 ZLFA_SHXG: "", // 生活习惯 ZLFA_XLTS: "", //心理调适 ZLFA_LCYYZL: "", //临床用药治疗 - ZLFA_ZJ_LF_SMZ: "", // 失眠症-针灸疗法-疗法 - ZLFA_ZJ_XW_SMZ: "", // 失眠症-针灸疗法-穴位 - ZLFA_YW_SMZ: "", // 失眠症-药物治疗 - ZLFA_ZJ_LF_QT: "", // 其他-针灸疗法-疗法 + ZLFA_ZJ_LF_SMZ: [], // 失眠症-针灸疗法-疗法 + ZLFA_ZJ_XW_SMZ: [], // 失眠症-针灸疗法-穴位 + ZLFA_YW_SMZ: [], // 失眠症-药物治疗 + ZLFA_YW_SMZ_QT: "", // 失眠症-药物治疗-其他 + ZLFA_ZJ_LF_QT: [], // 其他-针灸疗法-疗法 ZLFA_ZJ_XW_QT: "", // 其他-针灸疗法-穴位 ZLFA_YW_QT: "", // 其他-药物治疗 + + SFDL: [], //随访队列 }; }, @@ -1096,8 +1365,38 @@ export default { }; - + + + diff --git a/acupuncture-前台/src/views/screening/index.vue b/acupuncture-前台/src/views/screening/index.vue new file mode 100644 index 00000000..cdcc4a26 --- /dev/null +++ b/acupuncture-前台/src/views/screening/index.vue @@ -0,0 +1,362 @@ + + + + + + diff --git a/acupuncture-前台/src/views/screening/qrCode.vue b/acupuncture-前台/src/views/screening/qrCode.vue new file mode 100644 index 00000000..b5a8f8a3 --- /dev/null +++ b/acupuncture-前台/src/views/screening/qrCode.vue @@ -0,0 +1,375 @@ + + + + + + diff --git a/acupuncture-后台/src/views/medicalFile/index.vue b/acupuncture-后台/src/views/medicalFile/index.vue index 5884c41d..2dff2283 100644 --- a/acupuncture-后台/src/views/medicalFile/index.vue +++ b/acupuncture-后台/src/views/medicalFile/index.vue @@ -399,7 +399,7 @@ 提交审核 --> -
+ diff --git a/acupuncture-后台/src/views/patientFile/index.vue b/acupuncture-后台/src/views/patientFile/index.vue index 93aecbf6..04f9772e 100644 --- a/acupuncture-后台/src/views/patientFile/index.vue +++ b/acupuncture-后台/src/views/patientFile/index.vue @@ -45,6 +45,7 @@ +