diff --git a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart index b780e952..04c36ed9 100644 --- a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart @@ -251,6 +251,8 @@ class _UpdateObjectivePageState extends State widget.patientInfo.admissionNo.isNotEmpty) { listHisProgNotePhysicalExaminationVM.admissionNo = int.parse(widget.patientInfo.admissionNo); + } else { + listHisProgNotePhysicalExaminationVM.admissionNo = 0; } postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM .add(listHisProgNotePhysicalExaminationVM); diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart index 6320fc41..e1c97d75 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart @@ -51,7 +51,7 @@ class StepsWidget extends StatelessWidget { child: Center( child: Container( width: MediaQuery.of(context).size.width * - (patientInfo.admissionNo == null && + (patientInfo.admissionNo == null || patientInfo.admissionNo.isEmpty ? 0.9 : 0.85), @@ -114,8 +114,8 @@ class StepsWidget extends StatelessWidget { ), Positioned( top: circleTop, - left: patientInfo.admissionNo == null && - patientInfo.admissionNo.isEmpty + left: patientInfo.admissionNo == null || + patientInfo.admissionNo.isEmpty ? MediaQuery.of(context).size.width * 0.25 : MediaQuery.of(context).size.width * 0.71, child: InkWell( @@ -166,8 +166,8 @@ class StepsWidget extends StatelessWidget { ), ), ), - if (patientInfo.admissionNo == null && - patientInfo.admissionNo.isEmpty) + if (patientInfo.admissionNo == null || + patientInfo.admissionNo.isEmpty) Positioned( top: circleTop, left: MediaQuery.of(context).size.width * 0.47, @@ -221,8 +221,8 @@ class StepsWidget extends StatelessWidget { ), ), ), - if (patientInfo.admissionNo == null && - patientInfo.admissionNo.isEmpty) + if (patientInfo.admissionNo == null || + patientInfo.admissionNo.isEmpty) Positioned( top: circleTop, right: 0, @@ -288,8 +288,8 @@ class StepsWidget extends StatelessWidget { top: 30, child: Center( child: Container( - width: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null && - patientInfo.admissionNo.isEmpty?0.9:0.85), + width: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null || + patientInfo.admissionNo.isEmpty?0.9:0.85), child: Divider( color: Colors.grey, height: 0.75, @@ -348,8 +348,8 @@ class StepsWidget extends StatelessWidget { ), Positioned( top: circleTop, - right: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null && - patientInfo.admissionNo.isEmpty?0.25:0.71), + right: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null || + patientInfo.admissionNo.isEmpty?0.25:0.71), child: InkWell( onTap: () => index >= 2 ? changeCurrentTab(1) : null, child: Column( @@ -395,8 +395,8 @@ class StepsWidget extends StatelessWidget { ), ), ), - if (patientInfo.admissionNo == null && - patientInfo.admissionNo.isEmpty) + if (patientInfo.admissionNo == null || + patientInfo.admissionNo.isEmpty) Positioned( top: circleTop, right: MediaQuery.of(context).size.width * 0.50, @@ -450,8 +450,8 @@ class StepsWidget extends StatelessWidget { ), ), ), - if (patientInfo.admissionNo == null && - patientInfo.admissionNo.isEmpty) + if (patientInfo.admissionNo == null || + patientInfo.admissionNo.isEmpty) Positioned( top: circleTop, left: 0,