diff --git a/project.private.config.json b/project.private.config.json index d362a3c..9f986e0 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -22,13 +22,20 @@ "miniprogram": { "list": [ { - "name": "患者-健康档案", - "pathName": "pages/qaForm/index", + "name": "患者-更改手机号", + "pathName": "pages/changePhone/index", "query": "", "scene": null, "launchMode": "default" }, { + "name": "患者-健康档案", + "pathName": "pages/qaForm/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { "name": "患者-记录就诊时间", "pathName": "pages/signIn/index", "query": "", diff --git a/src/components/toast/index.scss b/src/components/toast/index.scss index 22769e1..daa2637 100644 --- a/src/components/toast/index.scss +++ b/src/components/toast/index.scss @@ -2349,6 +2349,16 @@ background: linear-gradient(to right, rgba(14, 182, 109, 1), rgba(0, 210, 119, 1)); border-radius: 24rpx 24rpx 24rpx 24rpx; } + &.durg { + .content { + .high { + color: rgba(22, 121, 203, 1); + } + } + .btn { + background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%); + } + } } .close { margin: 68rpx auto 0; @@ -2356,7 +2366,7 @@ width: 64rpx; height: 64rpx; } - &.popup-dedicated-doctor-drug { + &.drug { .popup-container { .btn { background-color: rgba(37, 217, 200, 1); diff --git a/src/components/toast/index.wxml b/src/components/toast/index.wxml index 4068a7f..5cb277d 100644 --- a/src/components/toast/index.wxml +++ b/src/components/toast/index.wxml @@ -659,10 +659,10 @@ - + diff --git a/src/doctor/pages/d_patientDetail/index.ts b/src/doctor/pages/d_patientDetail/index.ts index 9ef2427..51d23bd 100644 --- a/src/doctor/pages/d_patientDetail/index.ts +++ b/src/doctor/pages/d_patientDetail/index.ts @@ -2,7 +2,6 @@ import dayjs from 'dayjs' const app = getApp() -let echarts: any = null Page({ data: { toastShow: false, @@ -17,33 +16,6 @@ Page({ id: '', remark: '', detail: {} as any, - ec: { - lazyLoad: true, - }, - fields: { - 1: 'day', - 2: 'month', - 3: 'year', - }, - - StartDate: '', - EndDate: '', - typeRange: [ - { - id: '1', - value: '按天', - }, - { - id: '2', - value: '按月', - }, - { - id: '3', - value: '按年', - }, - ], - type: '3', - typeName: '按年', userInfo: {}, popupRemarkShow: false, @@ -122,8 +94,6 @@ Page({ }, ], - nav: '0', - ageRangeMap: { 1: '<40岁', 2: '40-49岁', @@ -139,40 +109,6 @@ Page({ }, adlList: [] as any, - tableData: [ - { - title: '说话', - key: 'TalkingScore', - }, - { - title: '咀嚼', - key: 'ChewScore', - }, - { - title: '吞咽', - key: 'SwallowScore', - }, - { - title: '呼吸', - key: 'BreathScore', - }, - { - title: '刷牙梳头能力受损', - key: 'BrushTeethAndCombHairScore', - }, - { - title: '从椅子上起身能力受损', - key: 'GetUpFromChairScore', - }, - { - title: '复视/重影', - key: 'DoubleVisionScore', - }, - { - title: '眼睑下垂', - key: 'DroopyEyelidsScore', - }, - ], pagination: { page: 1, @@ -180,25 +116,14 @@ Page({ count: 1, }, }, - ecDataTrendComponent1: null as any, - ecDataTrendComponent2: null as any, - ecDataTrendComponent3: null as any, - ecDataTrendComponent4: null as any, - async onLoad(option) { + onLoad(option) { this.setData({ id: option.id, }) - echarts = await require.async('../../../resource/components/echart/echarts.js') - this.ecDataTrendComponent1 = this.selectComponent('#chart1') - this.ecDataTrendComponent2 = this.selectComponent('#chart2') - this.ecDataTrendComponent3 = this.selectComponent('#chart3') - this.ecDataTrendComponent4 = this.selectComponent('#chart4') - app.waitLogin().then(async (_res) => { app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORPATIENTDETAIL' }) this.getDoctorDetail() await this.getDetail() - this.handleNav({ currentTarget: { dataset: { index: '0' } } }, false) }) }, getDoctorDetail() { @@ -242,10 +167,13 @@ Page({ res.HealthQA.questions.forEach((q: any) => { q.isAnswerArray = Array.isArray(q.AnswerText) if (q.isAnswerArray) { - q.AnswerTextArr = q.AnswerText - q.AnswerTextStr = q.AnswerText.join('、') + (q.OtherText ? `（${q.OtherText}）` : '') + q.AnswerTextArr = q.AnswerText.filter((a: any) => a !== null && a !== undefined) + q.AnswerTextStr = q.AnswerTextArr.join('、') + (q.OtherText ? `（${q.OtherText}）` : '') } else { - q.AnswerTextStr = q.AnswerText + (q.OtherText ? `（${q.OtherText}）` : '') + q.AnswerTextStr = q.AnswerText || '' + if (q.AnswerTextStr && q.OtherText) { + q.AnswerTextStr += `（${q.OtherText}）` + } } }) } @@ -257,72 +185,7 @@ Page({ }) }) }, - handleTypeChange(e) { - const index = e.detail.value - const { typeRange, nav } = this.data - const type = typeRange[index].id - const typeName = typeRange[index].value - let EndDate = '' - let StartDate = '' - if (type === '1') { - EndDate = dayjs().format('YYYY-MM-DD') - StartDate = dayjs().subtract(6, 'd').format('YYYY-MM-DD') - } else if (type === '2') { - EndDate = dayjs().format('YYYY-MM') - StartDate = dayjs().subtract(1, 'M').format('YYYY-MM') - } else if (type === '3') { - EndDate = dayjs().format('YYYY') - StartDate = dayjs().subtract(1, 'y').format('YYYY') - } - this.setData({ - type, - typeName, - EndDate, - StartDate, - }) - if (nav === '0') { - this.getGraph() - } else { - this.getAdlList() - } - }, - handleChange() { - const { nav } = this.data - if (nav === '0') { - this.getGraph() - } else { - this.getAdlList() - } - }, - getGraph() { - wx.ajax({ - method: 'GET', - url: '?r=igg4/doctor/patient/adl-graph', - data: { - patientId: this.data.id, - StartDate: this.data.StartDate, - EndDate: this.data.EndDate, - DateType: this.data.type, - count: 0, - }, - }).then(async (res) => { - this.initChart1(res.adlSummary) - this.initChart2(res.adlSummary) - - const medication = res.medication.map((item) => { - return { - Date: item.InjectionDate, - ...item, - } - }) - const list = res.list - const newList: any[] = this.mergeArr(list, medication) - const chart3 = await this.initChart3(newList as never[]) - const chart4 = await this.initChart4(newList as never[]) - echarts.connect([chart3, chart4]) - }) - }, - mergeArr(array1: any[] = [], array2: any[] = []) { + handleRemark() { // 合并两个数组中相同Date字段的对象 const mergedArray: any[] = [] const mergedMap = new Map() diff --git a/src/doctor/pages/d_patientDetail/index.wxml b/src/doctor/pages/d_patientDetail/index.wxml index 16f876e..b27fdcd 100644 --- a/src/doctor/pages/d_patientDetail/index.wxml +++ b/src/doctor/pages/d_patientDetail/index.wxml @@ -18,14 +18,14 @@ - {{item.QuestionContent}} + {{item.DoctorTitle}} {{item.AnswerTextStr}} {{ans}}（{{item.OtherText}}） - 未作答 + 无 diff --git a/src/images/bg34.png b/src/images/bg34.png new file mode 100644 index 0000000..22b4f59 Binary files /dev/null and b/src/images/bg34.png differ diff --git a/src/pages/changePhone/index.scss b/src/pages/changePhone/index.scss index 0f05640..4d4747c 100644 --- a/src/pages/changePhone/index.scss +++ b/src/pages/changePhone/index.scss @@ -8,7 +8,7 @@ border: 1rpx solid #edeff0; display: flex; .place-input { - color: rgba(33, 33, 32, 0.40); + color: rgba(33, 33, 32, 0.4); } .input { flex: 1; @@ -34,3 +34,12 @@ border-radius: 12rpx; } } + +#drug-page { + .btn { + color: rgba(22, 121, 203, 1); + } + .submit { + background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%); + } +} diff --git a/src/pages/changePhone/index.wxml b/src/pages/changePhone/index.wxml index 03bfc59..ac031d3 100644 --- a/src/pages/changePhone/index.wxml +++ b/src/pages/changePhone/index.wxml @@ -1,4 +1,4 @@ - +