diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 9627353f..6632df4d 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -62,7 +62,7 @@ class ProcedureViewModel extends BaseViewModel { await _procedureService.getProcedure(mrn: mrn); if (_procedureService.hasError) { error = _procedureService.error; - setState(ViewState.ErrorLocal); + setState(ViewState.Error); } else setState(ViewState.Idle); } diff --git a/lib/screens/medical-file/medical_file_details.dart b/lib/screens/medical-file/medical_file_details.dart index 25ea1f22..bc3323ad 100644 --- a/lib/screens/medical-file/medical_file_details.dart +++ b/lib/screens/medical-file/medical_file_details.dart @@ -468,10 +468,8 @@ class _MedicalFileDetailsState extends State { Row( children: [ AppText( - 'ICD', - fontWeight: - FontWeight - .w700, + 'ICD: ', + fontSize: 13.0, ), AppText( model @@ -488,14 +486,20 @@ class _MedicalFileDetailsState extends State { index] .iCD10 .trim(), + fontSize: 13.5, + fontWeight: + FontWeight + .w700, ), SizedBox( - width: 35.0), + width: 15.0), + ], + ), + Row( + children: [ AppText( 'Condition: ', - fontWeight: - FontWeight - .w700, + fontSize: 12.5, ), Expanded( child: AppText( @@ -514,6 +518,10 @@ class _MedicalFileDetailsState extends State { index] .condition .trim(), + fontSize: 13.0, + fontWeight: + FontWeight + .w700, ), ), ], @@ -539,6 +547,7 @@ class _MedicalFileDetailsState extends State { fontWeight: FontWeight .w700, + fontSize: 15.0, ), ) ], @@ -547,24 +556,29 @@ class _MedicalFileDetailsState extends State { children: [ AppText( 'Type: ', - fontWeight: - FontWeight - .w700, + fontSize: 15.5, ), Expanded( - child: AppText(model - .medicalFileList[ - 0] - .entityList[0] - .timelines[ - encounterNumber] - .timeLineEvents[ - 0] - .consulations[ - 0] - .lstAssessments[ - index] - .type), + child: AppText( + model + .medicalFileList[ + 0] + .entityList[ + 0] + .timelines[ + encounterNumber] + .timeLineEvents[ + 0] + .consulations[ + 0] + .lstAssessments[ + index] + .type, + fontSize: 16.0, + fontWeight: + FontWeight + .w700, + ), ), ], ), @@ -700,9 +714,6 @@ class _MedicalFileDetailsState extends State { children: [ AppText( 'Procedure ID: ', - fontWeight: - FontWeight - .w700, ), AppText( model @@ -720,6 +731,11 @@ class _MedicalFileDetailsState extends State { index] .procedureId .trim(), + fontSize: + 13.5, + fontWeight: + FontWeight + .w700, ), ], ), @@ -729,9 +745,6 @@ class _MedicalFileDetailsState extends State { children: [ AppText( 'Order Date: ', - fontWeight: - FontWeight - .w700, ), AppText( Helpers.getDateFormatted( @@ -755,6 +768,9 @@ class _MedicalFileDetailsState extends State { )), fontSize: 13.5, + fontWeight: + FontWeight + .w700, ), ], ), @@ -792,23 +808,26 @@ class _MedicalFileDetailsState extends State { children: [ AppText( 'CPT Code : ', + ), + AppText( + model + .medicalFileList[ + 0] + .entityList[0] + .timelines[ + encounterNumber] + .timeLineEvents[ + 0] + .consulations[ + 0] + .lstProcedure[ + index] + .patientID + .toString(), fontWeight: FontWeight .w700, ), - AppText(model - .medicalFileList[ - 0] - .entityList[0] - .timelines[ - encounterNumber] - .timeLineEvents[ - 0] - .consulations[0] - .lstProcedure[ - index] - .patientID - .toString()), ], ), SizedBox( @@ -924,22 +943,25 @@ class _MedicalFileDetailsState extends State { children: [ AppText( 'Exam Type: ', + ), + AppText( + model + .medicalFileList[ + 0] + .entityList[0] + .timelines[ + encounterNumber] + .timeLineEvents[ + 0] + .consulations[ + 0] + .lstPhysicalExam[ + index] + .examDesc, fontWeight: FontWeight .w700, ), - AppText(model - .medicalFileList[ - 0] - .entityList[0] - .timelines[ - encounterNumber] - .timeLineEvents[ - 0] - .consulations[0] - .lstPhysicalExam[ - index] - .examDesc), ], ), Row( @@ -968,22 +990,25 @@ class _MedicalFileDetailsState extends State { children: [ AppText( 'Abnormal: ', + ), + AppText( + model + .medicalFileList[ + 0] + .entityList[0] + .timelines[ + encounterNumber] + .timeLineEvents[ + 0] + .consulations[ + 0] + .lstPhysicalExam[ + index] + .abnormal, fontWeight: FontWeight .w700, ), - AppText(model - .medicalFileList[ - 0] - .entityList[0] - .timelines[ - encounterNumber] - .timeLineEvents[ - 0] - .consulations[0] - .lstPhysicalExam[ - index] - .abnormal), ], ), SizedBox( diff --git a/lib/screens/procedures/ProcedureCard.dart b/lib/screens/procedures/ProcedureCard.dart index 31595fa6..1b51ba30 100644 --- a/lib/screens/procedures/ProcedureCard.dart +++ b/lib/screens/procedures/ProcedureCard.dart @@ -162,12 +162,15 @@ class ProcedureCard extends StatelessWidget { ), if (entityList.categoryID == 2 || entityList.categoryID == 4) - Icon(Icons.edit) + InkWell( + child: Icon(Icons.edit), + onTap: onTap, + ) ], ) ], ), - onTap: onTap, + //onTap: onTap, ), ), ), diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index 7d95fd35..b4299d2e 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -115,31 +115,28 @@ class ProcedureScreen extends StatelessWidget { model.procedureList[0].entityList[index].categoryID, entityList: model.procedureList[0].entityList[index], onTap: () { - // if (model.procedureList[0].entityList[index] - // .categoryID == - // 2 || - // model.procedureList[0].entityList[index] - // .categoryID == - // 4) { - updateProcedureForm(context, - model: model, - patient: patient, - remarks: model - .procedureList[0].entityList[index].remarks, - orderType: model - .procedureList[0].entityList[index].orderType - .toString(), - orderNo: model - .procedureList[0].entityList[index].orderNo, - procedureName: model.procedureList[0] - .entityList[index].procedureName, - categoreId: model - .procedureList[0].entityList[index].categoryID - .toString(), - procedureId: model.procedureList[0] - .entityList[index].procedureId, - limetNo: model.procedureList[0].entityList[index] - .lineItemNo); + if (model.procedureList[0].entityList[index].categoryID == + 2 || + model.procedureList[0].entityList[index].categoryID == 4) + updateProcedureForm(context, + model: model, + patient: patient, + remarks: model + .procedureList[0].entityList[index].remarks, + orderType: model.procedureList[0] + .entityList[index].orderType + .toString(), + orderNo: model + .procedureList[0].entityList[index].orderNo, + procedureName: model.procedureList[0] + .entityList[index].procedureName, + categoreId: model.procedureList[0] + .entityList[index].categoryID + .toString(), + procedureId: model.procedureList[0] + .entityList[index].procedureId, + limetNo: model.procedureList[0] + .entityList[index].lineItemNo); // } else // helpers.showErrorToast( // 'You Cant Update This Procedure'); diff --git a/lib/widgets/shared/bottom_nav_bar.dart b/lib/widgets/shared/bottom_nav_bar.dart index 026f46b2..0f5673ab 100644 --- a/lib/widgets/shared/bottom_nav_bar.dart +++ b/lib/widgets/shared/bottom_nav_bar.dart @@ -37,8 +37,8 @@ class _BottomNavBarState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ BottomNavigationItem( - icon: DoctorApp.home_icon, - activeIcon: DoctorApp.home_icon_active, + icon: DoctorApp.home_icon_active, + activeIcon: DoctorApp.home_active, changeIndex: _changeIndex, index: _index, currentIndex: 0, @@ -46,7 +46,7 @@ class _BottomNavBarState extends State { ), BottomNavigationItem( icon: DoctorApp.schedule_icon, - activeIcon: DoctorApp.scdedule_icon_active, + activeIcon: DoctorApp.scdedule_icon_active_1, changeIndex: _changeIndex, index: _index, currentIndex: 1, @@ -54,7 +54,7 @@ class _BottomNavBarState extends State { ), BottomNavigationItem( icon: DoctorApp.qr_code, - activeIcon: DoctorApp.qr_code, + activeIcon: DoctorApp.qr_reader_active_1, changeIndex: _changeIndex, index: _index, currentIndex: 2, @@ -62,7 +62,7 @@ class _BottomNavBarState extends State { ), BottomNavigationItem( icon: DoctorApp.message_icon, - activeIcon: DoctorApp.message_icon_active, + activeIcon: DoctorApp.dr_reply_active_1, changeIndex: _changeIndex, index: _index, currentIndex: 3,