diff --git a/features/patient/src/main/ets/components/PatientDetailsComp.ets b/features/patient/src/main/ets/components/PatientDetailsComp.ets index fcb31b2..848edea 100644 --- a/features/patient/src/main/ets/components/PatientDetailsComp.ets +++ b/features/patient/src/main/ets/components/PatientDetailsComp.ets @@ -166,11 +166,7 @@ export struct PatientDetailsComp { HMRouterMgr.pop() }, rightItemAction: () => { - HMRouterMgr.push({pageUrl: 'BuildOrEditGroupPage',param:{"title": "新建分组"}}) - // router.pushUrl({ - // url: 'pages/PatientsPage/BuildOrEditGroupPage', - // params: { "title": "新建分组" } - // }) + HMRouterMgr.push({pageUrl: 'PatientCommonSettingComp',param:{"title":"患者详情","patient_uuid":this.params.patient_uuid}}) } }) Scroll(this.scroller) { diff --git a/features/patient/src/main/ets/components/PatientsGroup.ets b/features/patient/src/main/ets/components/PatientsGroup.ets index de340e7..16150ea 100644 --- a/features/patient/src/main/ets/components/PatientsGroup.ets +++ b/features/patient/src/main/ets/components/PatientsGroup.ets @@ -29,7 +29,8 @@ export struct PatientsGroup { }) aboutToAppear(): void { - this.getIsMaiLanData(); + this.getGroupData() + this.getIsMaiLanData() this.groupSortList = [{"name":"按首字母","isSeleted":false} as sortModel,{"name":"分组人数","isSeleted":false} as sortModel] this.innerSortList = [{"name":"按首字母","isSeleted":false} as sortModel,{"name":"随访时间","isSeleted":false} as sortModel] } diff --git a/products/expert/src/main/ets/pages/PatientsPage/PatientsGroupPage.ets b/products/expert/src/main/ets/pages/PatientsPage/PatientsGroupPage.ets index 70f4f51..5c20b87 100644 --- a/products/expert/src/main/ets/pages/PatientsPage/PatientsGroupPage.ets +++ b/products/expert/src/main/ets/pages/PatientsPage/PatientsGroupPage.ets @@ -1,7 +1,6 @@ import { PatientsGroup } from 'patient' -import { HMDefaultGlobalAnimator, HMNavigation } from '@hadss/hmrouter' -import { AttributeUpdater } from '@kit.ArkUI' -import { TabBarComp } from 'netease' +import { HMDefaultGlobalAnimator, HMNavigation } from '@hadss/hmrouter'; +import { AttributeUpdater } from '@kit.ArkUI'; class NavModifier extends AttributeUpdater { initializeModifier(instance: NavigationAttribute): void { @@ -16,9 +15,7 @@ class NavModifier extends AttributeUpdater { @Component struct PatientsGroupPage { @Provide refreshFlag:boolean = false; - modifier: NavModifier = new NavModifier() - @State - activeIndex: number = 0 + modifier: NavModifier = new NavModifier(); onPageShow(): void { this.refreshFlag = !this.refreshFlag; @@ -35,8 +32,7 @@ struct PatientsGroupPage { modifier:this.modifier } }) { - // PatientsGroup() - TabBarComp({ activeIndex: this.activeIndex}) + PatientsGroup() } } .height('100%')