From 5ba523a579c5dec5abf2e32805ffe4000da9b68b Mon Sep 17 00:00:00 2001 From: kola-web Date: Mon, 4 Aug 2025 20:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=97=E6=B5=8B=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pickerArea/index.scss | 10 +- src/doctor/pages/coltStat/index.ts | 16 +++- src/doctor/pages/file/index.ts | 111 ++++++++++++----------- src/doctor/pages/followPlan/index.ts | 5 - src/doctor/pages/followPlan/index.wxml | 4 +- src/doctor/pages/lastDiagnosisReport/index.wxml | 6 +- src/doctor/pages/preDiagnosisReport/index.wxml | 20 ++-- src/patient/pages/coltStat/index.ts | 17 ++-- src/patient/pages/file/index.ts | 102 +++++++++++---------- src/patient/pages/followPlan/index.ts | 8 +- src/patient/pages/followPlan/index.wxml | 4 +- src/patient/pages/lastDiagnosisReport/index.ts | 6 +- src/patient/pages/lastDiagnosisReport/index.wxml | 3 +- src/patient/pages/preDiagnosisReport/index.ts | 11 +++ src/patient/pages/preDiagnosisReport/index.wxml | 3 +- 15 files changed, 186 insertions(+), 140 deletions(-) diff --git a/src/components/pickerArea/index.scss b/src/components/pickerArea/index.scss index de262c0..cbd27b5 100644 --- a/src/components/pickerArea/index.scss +++ b/src/components/pickerArea/index.scss @@ -41,7 +41,7 @@ padding: 18rpx 30rpx; box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.11); border-radius: 12rpx 12rpx 12rpx 12rpx; - border: 2rpx solid #e04775; + border: 2rpx solid #f23a2f; display: flex; align-items: center; justify-content: space-between; @@ -69,7 +69,7 @@ display: flex; align-items: center; justify-content: center; - background: #e04775; + background: #f23a2f; border-radius: 12rpx 12rpx 12rpx 12rpx; } } @@ -91,7 +91,7 @@ background: #f7f8f9; &.active { color: #fff; - background-color: rgba(224, 71, 117, 1); + background-color: #f23a2f; } } } @@ -118,9 +118,9 @@ height: 36rpx; } &.active { - color: rgba(224, 71, 117, 1); + color: #f23a2f; .word { - color: rgba(224, 71, 117, 1); + color: #f23a2f; } } } diff --git a/src/doctor/pages/coltStat/index.ts b/src/doctor/pages/coltStat/index.ts index 42d84ac..f3ee233 100644 --- a/src/doctor/pages/coltStat/index.ts +++ b/src/doctor/pages/coltStat/index.ts @@ -96,13 +96,13 @@ Page({ res.altList = res.altList || [] res.cfRecordList = res.cfRecordList || [] res.astList.forEach((item: any) => { - astList[item.beginDate] = item.ast + astList[item.beginDate || item.endDate] = item.ast }) res.altList.forEach((item: any) => { - altList[item.beginDate] = item.alt + altList[item.beginDate || item.endDate] = item.alt }) res.cfRecordList.forEach((item: any) => { - cfRecordList[item.beginDate] = item.clottingFactor + cfRecordList[item.beginDate || item.endDate] = item.clottingFactor }) const initParams = { astList, @@ -344,8 +344,8 @@ Page({ }, grid: { top: '30', - left: '10', - right: '10', + left: '0', + right: '0', bottom: '45', containLabel: true, }, @@ -377,6 +377,9 @@ Page({ { type: 'value', name: '单位:%', + nameTextStyle: { + align: 'left', + }, axisLabel: { color: 'rgba(161, 164, 172, 1)', }, @@ -399,6 +402,9 @@ Page({ { type: 'value', name: '单位:U/L', + nameTextStyle: { + align: 'right', + }, position: 'right', axisLabel: { color: 'rgba(161, 164, 172, 1)', diff --git a/src/doctor/pages/file/index.ts b/src/doctor/pages/file/index.ts index 4b396c8..15ebcf8 100644 --- a/src/doctor/pages/file/index.ts +++ b/src/doctor/pages/file/index.ts @@ -55,7 +55,7 @@ Page({ app.waitLogin({ type: 2 }).then(() => { app.mpBehavior({ PageName: 'PG_MEDICALRECORD_VISIT' }) this.getPatientInfo() - this.getInfo() + this.handleSwiperChange() }) }, getPatientInfo() { @@ -80,81 +80,90 @@ Page({ this.setData({ nav, }) - this.getInfo() }, - handleSwiperChange(e) { + async handleSwiperChange(e?: any) { + let current = this.data.nav + if (e) { + current = e.detail.current + } const name = { 0: 'BTN_TREATMENT_RECORD_TAB_CLICK', 1: 'BTN_MEDICAL_HISTORY_TAB_CLICK', 2: 'BTN_FOLLOWUP_CALENDAR_TAB_CLICK', - }[e.detail.current] + }[current] if (name) { app.mpBehavior({ PageName: name }) } + this.setData({ + nav: current, + }) + await this.getInfo() const query = wx.createSelectorQuery() - query.select(`#container${e.detail.current}`).boundingClientRect() + query.select(`#container${current}`).boundingClientRect() query.exec((res) => { this.setData({ swiperHeight: res[0].height + 42, - nav: e.detail.current, }) }) }, - getInfo() { + async getInfo() { const { nav } = this.data if (nav == 0) { - wx.ajax({ - method: 'GET', - url: '?r=wtx/doctor/treatment/get-archives', - data: { - patientId: this.data.id, - }, - }).then((res) => { - this.setData({ - ...res, - empty0: - !res.periodOne.length && - !res.periodTwo.length && - !res.periodFour.length && - !res.periodThree.injectionDate && - !res.periodThree.injectionWeight && - !res.periodThree.injectionDrugs && - !res.periodThree.injectionNum, + return wx + .ajax({ + method: 'GET', + url: '?r=wtx/doctor/treatment/get-archives', + data: { + patientId: this.data.id, + }, + }) + .then((res) => { + this.setData({ + ...res, + empty0: + !res.periodOne.length && + !res.periodTwo.length && + !res.periodFour.length && + !res.periodThree.injectionDate && + !res.periodThree.injectionWeight && + !res.periodThree.injectionDrugs && + !res.periodThree.injectionNum, + }) }) - this.handleSwiperChange({ detail: { current: 0 } }) - }) } if (nav == 1) { - wx.ajax({ - method: 'GET', - url: '?r=wtx/doctor/treatment/get-medical-history-info', - data: { - patientId: this.data.id, - }, - }).then((res) => { - this.setData({ - medical: res, + return wx + .ajax({ + method: 'GET', + url: '?r=wtx/doctor/treatment/get-medical-history-info', + data: { + patientId: this.data.id, + }, + }) + .then((res) => { + this.setData({ + medical: res, + }) }) - this.handleSwiperChange({ detail: { current: 1 } }) - }) } if (nav == 2) { - wx.ajax({ - method: 'GET', - url: '?r=wtx/doctor/treatment/get-follow-up-exam', - data: { - patientId: this.data.id, - }, - }).then((res) => { - this.setData({ - followExam: { - injectionDateName: dayjs(res.injectionDate).format('YYYY年MM月DD日 ddd'), - ...res, + return wx + .ajax({ + method: 'GET', + url: '?r=wtx/doctor/treatment/get-follow-up-exam', + data: { + patientId: this.data.id, }, }) - this.getFollowList() - this.handleSwiperChange({ detail: { current: 2 } }) - }) + .then((res) => { + this.setData({ + followExam: { + injectionDateName: res.injectionDate ? dayjs(res.injectionDate).format('YYYY年MM月DD日 ddd') : '', + ...res, + }, + }) + this.getFollowList() + }) } }, getFollowList(dateMonth = '') { diff --git a/src/doctor/pages/followPlan/index.ts b/src/doctor/pages/followPlan/index.ts index ac9c70b..8c07cdf 100644 --- a/src/doctor/pages/followPlan/index.ts +++ b/src/doctor/pages/followPlan/index.ts @@ -18,11 +18,6 @@ Page({ this.getDetail() }) }, - handleInject() { - wx.navigateTo({ - url: '/patient/pages/injectDate/index', - }) - }, getDetail() { wx.ajax({ method: 'GET', diff --git a/src/doctor/pages/followPlan/index.wxml b/src/doctor/pages/followPlan/index.wxml index 62b82f0..fdd81e6 100644 --- a/src/doctor/pages/followPlan/index.wxml +++ b/src/doctor/pages/followPlan/index.wxml @@ -1,10 +1,10 @@ - + 注射日：{{injectionDate || '未录入'}} - 基因治疗后 监测频率 + 基因治疗后监测频率 diff --git a/src/doctor/pages/lastDiagnosisReport/index.wxml b/src/doctor/pages/lastDiagnosisReport/index.wxml index a1fe469..f2c1e32 100644 --- a/src/doctor/pages/lastDiagnosisReport/index.wxml +++ b/src/doctor/pages/lastDiagnosisReport/index.wxml @@ -37,7 +37,7 @@ 生化检查 - 已检查 + {{isBiochemical==1?'已检查':'未检查'}} @@ -121,7 +121,7 @@ 凝血因子 IX 活性 - 已检查 + {{isCFIxActivity==1?'已检查':'未检查'}} @@ -168,7 +168,7 @@ 其他检查 - 已检查 + {{isOther==1?'已检查':'未检查'}} 您的其他项检查 diff --git a/src/doctor/pages/preDiagnosisReport/index.wxml b/src/doctor/pages/preDiagnosisReport/index.wxml index 9f9af23..aabdfd5 100644 --- a/src/doctor/pages/preDiagnosisReport/index.wxml +++ b/src/doctor/pages/preDiagnosisReport/index.wxml @@ -39,7 +39,7 @@ - 已检查 + {{isBloodRoutine==1?'已检查':'未检查'}} 重点检查项目:白细胞计数）WBC）血红蛋白（HGB）血小板计数（PLT） @@ -75,7 +75,7 @@ - 已检查 + {{isBiochemical==1?'已检查':'未检查'}} @@ -165,7 +165,7 @@ 凝血因子 IX 活性 - 已检查 + {{isCFIxActivity==1?'已检查':'未检查'}} @@ -214,7 +214,7 @@ 凝血因子 IX 抑制物检测 - 已检查 + {{isCFIxInhibitor==1?'已检查':'未检查'}} @@ -250,7 +250,7 @@ 乙型肝炎相关检查 - 已检查 + {{isHepatitisB==1?'已检查':'未检查'}} @@ -291,7 +291,7 @@ 丙型肝炎相关检查 - 已检查 + {{isHepatitisC==1?'已检查':'未检查'}} @@ -334,7 +334,7 @@ HIV抗体 - 已检查 + {{isHivAntibody==1?'已检查':'未检查'}} 类免疫缺陷病毒抗体（HIV - Ab） @@ -372,7 +372,7 @@ 甲胎蛋白（AFP）检测 - 已检查 + {{isAfp==1?'已检查':'未检查'}} @@ -421,7 +421,7 @@ AAV 抗体检查 - 已检查 + {{isAav==1?'已检查':'未检查'}} 提交您的AAV抗体检查报告 @@ -459,7 +459,7 @@ 其他检查 - 已检查 + {{isOther==1?'已检查':'未检查'}} 您的其他项检查 diff --git a/src/patient/pages/coltStat/index.ts b/src/patient/pages/coltStat/index.ts index 538e872..f4fc4d1 100644 --- a/src/patient/pages/coltStat/index.ts +++ b/src/patient/pages/coltStat/index.ts @@ -102,13 +102,13 @@ Page({ res.altList = res.altList || [] res.cfRecordList = res.cfRecordList || [] res.astList.forEach((item: any) => { - astList[item.beginDate] = item.ast + astList[item.beginDate || item.endDate] = item.ast }) res.altList.forEach((item: any) => { - altList[item.beginDate] = item.alt + altList[item.beginDate || item.endDate] = item.alt }) res.cfRecordList.forEach((item: any) => { - cfRecordList[item.beginDate] = item.clottingFactor + cfRecordList[item.beginDate || item.endDate] = item.clottingFactor }) const initParams = { astList, @@ -310,7 +310,6 @@ Page({ altArr.push(altList[item] ? Number(altList[item]) : 0) cfRecordArr.push(cfRecordList[item] ? Number(cfRecordList[item]) : 0) }) - console.log(altArr) this.ecDataTrendComponent.init((canvas, width, height, dpr) => { let chart = echarts.init(canvas, null, { width: width, @@ -351,8 +350,8 @@ Page({ }, grid: { top: '30', - left: '10', - right: '10', + left: '0', + right: '0', bottom: '45', containLabel: true, }, @@ -384,6 +383,9 @@ Page({ { type: 'value', name: '单位:%', + nameTextStyle: { + align: 'left', + }, axisLabel: { color: 'rgba(161, 164, 172, 1)', }, @@ -406,6 +408,9 @@ Page({ { type: 'value', name: '单位:U/L', + nameTextStyle: { + align: 'right', + }, position: 'right', axisLabel: { color: 'rgba(161, 164, 172, 1)', diff --git a/src/patient/pages/file/index.ts b/src/patient/pages/file/index.ts index cc57e6b..41ce2cf 100644 --- a/src/patient/pages/file/index.ts +++ b/src/patient/pages/file/index.ts @@ -1,4 +1,5 @@ import dayjs from 'dayjs' +import { ColorGradient } from 'XrFrame/components/particle/gradient' const licia = require('miniprogram-licia') const app = getApp() @@ -54,7 +55,7 @@ Page({ onShow() { app.waitLogin({ type: 1 }).then(() => { app.mpBehavior({ PageName: 'PG_PROFILE_VISIT' }) - this.getInfo() + this.handleSwiperChange() app.getUserInfo(1).then((userInfo) => { this.setData({ userInfo: { @@ -73,75 +74,84 @@ Page({ this.setData({ nav, }) - this.getInfo() }, - handleSwiperChange(e) { + async handleSwiperChange(e?: any) { + let current = this.data.nav + if (e) { + current = e.detail.current + } const name = { 0: 'BTN_TREATMENTARCHIVE_TAB_CLICK', 1: 'BTN_MEDICALHISTORY_TAB_CLICK', 2: 'BTN_FOLLOWUPCALENDAR_TAB_CLICK', - }[e.detail.current] + }[current] if (name) { app.mpBehavior({ PageName: name }) } + this.setData({ + nav: current, + }) + await this.getInfo() const query = wx.createSelectorQuery() - query.select(`#container${e.detail.current}`).boundingClientRect() + query.select(`#container${current}`).boundingClientRect() query.exec((res) => { this.setData({ swiperHeight: res[0].height + 42, - nav: e.detail.current, }) }) }, - getInfo() { + async getInfo() { const { nav } = this.data if (nav == 0) { - wx.ajax({ - method: 'GET', - url: '?r=wtx/treatment/get-archives', - data: {}, - }).then((res) => { - this.setData({ - ...res, - empty0: - !res.periodOne.length && - !res.periodTwo.length && - !res.periodFour.length && - !res.periodThree.injectionDate && - !res.periodThree.injectionWeight && - !res.periodThree.injectionDrugs && - !res.periodThree.injectionNum, + return wx + .ajax({ + method: 'GET', + url: '?r=wtx/treatment/get-archives', + data: {}, + }) + .then((res) => { + this.setData({ + ...res, + empty0: + !res.periodOne.length && + !res.periodTwo.length && + !res.periodFour.length && + !res.periodThree.injectionDate && + !res.periodThree.injectionWeight && + !res.periodThree.injectionDrugs && + !res.periodThree.injectionNum, + }) }) - this.handleSwiperChange({ detail: { current: 0 } }) - }) } if (nav == 1) { - wx.ajax({ - method: 'GET', - url: '?r=wtx/treatment/get-medical-history-info', - data: {}, - }).then((res) => { - this.setData({ - medical: res, + return wx + .ajax({ + method: 'GET', + url: '?r=wtx/treatment/get-medical-history-info', + data: {}, + }) + .then((res) => { + this.setData({ + medical: res, + }) }) - this.handleSwiperChange({ detail: { current: 1 } }) - }) } if (nav == 2) { - wx.ajax({ - method: 'GET', - url: '?r=wtx/treatment/get-follow-up-exam', - data: {}, - }).then((res) => { - this.setData({ - followExam: { - injectionDateName: dayjs(res.injectionDate).format('YYYY年MM月DD日 ddd'), - ...res, - }, + return wx + .ajax({ + method: 'GET', + url: '?r=wtx/treatment/get-follow-up-exam', + data: {}, + }) + .then((res) => { + this.setData({ + followExam: { + injectionDateName: res.injectionDate ? dayjs(res.injectionDate).format('YYYY年MM月DD日 ddd') : '', + ...res, + }, + }) + this.getFollowList() }) - this.getFollowList() - this.handleSwiperChange({ detail: { current: 2 } }) - }) } }, getFollowList(dateMonth = '') { diff --git a/src/patient/pages/followPlan/index.ts b/src/patient/pages/followPlan/index.ts index 0d0732f..339e9f0 100644 --- a/src/patient/pages/followPlan/index.ts +++ b/src/patient/pages/followPlan/index.ts @@ -13,6 +13,8 @@ Page({ this.setData({ period: options.period || '', }) + }, + onShow() { app.waitLogin({ type: 1 }).then(() => { app.mpBehavior({ PageName: 'PG_MYFOLLOWUPPLAN_VISIT' }) this.getDetail() @@ -41,6 +43,11 @@ Page({ }) }) }, + handleInject() { + wx.navigateTo({ + url: '/patient/pages/injectDate/index', + }) + }, handleClander() { app.mpBehavior({ PageName: 'BTN_MYFOLLOWUPCALENDAR_CLICK' }) wx.navigateTo({ @@ -50,7 +57,6 @@ Page({ handleLastDiagnosisReport() { app.mpBehavior({ PageName: 'BTN_ADDRECHECKRECORD_CLICK' }) wx.navigateTo({ - // url: '/patient/pages/lastDiagnosisReport/index', url: `/patient/pages/lastDiagnosisReport/index?period=${this.data.period}`, }) }, diff --git a/src/patient/pages/followPlan/index.wxml b/src/patient/pages/followPlan/index.wxml index 870cbfa..2af9111 100644 --- a/src/patient/pages/followPlan/index.wxml +++ b/src/patient/pages/followPlan/index.wxml @@ -1,10 +1,10 @@ - + 注射日：{{injectionDate || '未录入'}} - 基因治疗后时间监测频率 + 基因治疗后监测频率 diff --git a/src/patient/pages/lastDiagnosisReport/index.ts b/src/patient/pages/lastDiagnosisReport/index.ts index 3bfd62b..f8ea557 100644 --- a/src/patient/pages/lastDiagnosisReport/index.ts +++ b/src/patient/pages/lastDiagnosisReport/index.ts @@ -1,3 +1,5 @@ +import dayjs from 'dayjs' + const app = getApp() Page({ @@ -19,6 +21,8 @@ Page({ examId: '', period: '1', + allEndDate: dayjs().format('YYYY-MM-DD'), + beginDate: '', endDate: '', hospitalId: '', @@ -60,8 +64,6 @@ Page({ period: options.period || '1', edit: options.edit === '1', }) - }, - onShow() { app.waitLogin({ type: 1 }).then(() => { app.mpBehavior({ PageName: 'PG_LATESTRECHECKRECORD_VISIT' }) this.getDict() diff --git a/src/patient/pages/lastDiagnosisReport/index.wxml b/src/patient/pages/lastDiagnosisReport/index.wxml index 54bba44..0eef9a6 100644 --- a/src/patient/pages/lastDiagnosisReport/index.wxml +++ b/src/patient/pages/lastDiagnosisReport/index.wxml @@ -7,7 +7,7 @@ () Page({ @@ -23,6 +25,8 @@ Page({ examId: '', period: '1', + allEndDate: dayjs().format('YYYY-MM-DD'), + beginDate: '', endDate: '', isBloodRoutine: 2, @@ -274,6 +278,13 @@ Page({ const { back } = (e as any).currentTarget.dataset isBack = back == 1 } + if (isBack && !this.data.beginDate && !this.data.endDate) { + wx.showToast({ + title: '请选择开始和结束日期', + icon: 'none', + }) + return + } const { formKeys, period, examId, ...reset } = this.data const form = formKeys.reduce((pre, cur) => { pre[cur] = reset[cur] diff --git a/src/patient/pages/preDiagnosisReport/index.wxml b/src/patient/pages/preDiagnosisReport/index.wxml index 9f9e2b5..37ffd5b 100644 --- a/src/patient/pages/preDiagnosisReport/index.wxml +++ b/src/patient/pages/preDiagnosisReport/index.wxml @@ -7,7 +7,7 @@