diff --git a/assets/images/patient/Order_Procedures.png b/assets/images/patient/Order_Procedures.png new file mode 100644 index 00000000..a3cd8ae0 Binary files /dev/null and b/assets/images/patient/Order_Procedures.png differ diff --git a/assets/images/patient/Progress_notes.png b/assets/images/patient/Progress_notes.png new file mode 100644 index 00000000..f5aba841 Binary files /dev/null and b/assets/images/patient/Progress_notes.png differ diff --git a/assets/images/patient/admission_req.png b/assets/images/patient/admission_req.png new file mode 100644 index 00000000..b2335083 Binary files /dev/null and b/assets/images/patient/admission_req.png differ diff --git a/assets/images/patient/arrow_forward.png b/assets/images/patient/arrow_forward.png new file mode 100644 index 00000000..df393784 Binary files /dev/null and b/assets/images/patient/arrow_forward.png differ diff --git a/assets/images/patient/health_summary.png b/assets/images/patient/health_summary.png new file mode 100644 index 00000000..fe374ebc Binary files /dev/null and b/assets/images/patient/health_summary.png differ diff --git a/assets/images/patient/lab_results.png b/assets/images/patient/lab_results.png new file mode 100644 index 00000000..20e6b5ff Binary files /dev/null and b/assets/images/patient/lab_results.png differ diff --git a/assets/images/patient/order_prescription.png b/assets/images/patient/order_prescription.png new file mode 100644 index 00000000..26e7e9c4 Binary files /dev/null and b/assets/images/patient/order_prescription.png differ diff --git a/assets/images/patient/patient_sick_leave.png b/assets/images/patient/patient_sick_leave.png new file mode 100644 index 00000000..56196834 Binary files /dev/null and b/assets/images/patient/patient_sick_leave.png differ diff --git a/assets/images/patient/refer_patient.png b/assets/images/patient/refer_patient.png new file mode 100644 index 00000000..ac3aea6e Binary files /dev/null and b/assets/images/patient/refer_patient.png differ diff --git a/assets/images/patient/ucaf.png b/assets/images/patient/ucaf.png new file mode 100644 index 00000000..f7293599 Binary files /dev/null and b/assets/images/patient/ucaf.png differ diff --git a/assets/images/patient/vital_signs.png b/assets/images/patient/vital_signs.png new file mode 100644 index 00000000..76017194 Binary files /dev/null and b/assets/images/patient/vital_signs.png differ diff --git a/lib/screens/patients/profile/patient_profile_screen.dart b/lib/screens/patients/profile/patient_profile_screen.dart index 5b108999..ff07c4cf 100644 --- a/lib/screens/patients/profile/patient_profile_screen.dart +++ b/lib/screens/patients/profile/patient_profile_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -26,6 +27,7 @@ import 'package:provider/provider.dart'; class PatientProfileScreen extends StatelessWidget { PatiantInformtion patient; bool isFromSearch = false; + //TODO change it @override Widget build(BuildContext context) { @@ -63,7 +65,7 @@ class PatientProfileScreen extends StatelessWidget { SliverList( delegate: SliverChildListDelegate( [ - Column( + Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( @@ -181,7 +183,7 @@ class PatientProfileScreen extends StatelessWidget { height: 4, ), AppText( - "${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context) /*patient.age*/}", + "${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context)}", fontWeight: FontWeight.normal, fontSize: 1.6 * SizeConfig.textMultiplier, @@ -559,6 +561,147 @@ class PatientProfileScreen extends StatelessWidget { ), ], ), + /* Container( + // margin: EdgeInsets.all(6), + padding: EdgeInsets.only( + left: 0, right: 5, bottom: 5, top: 5), + decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(15), + color: Colors.white, + ), + child: Stack( + children: [ + Container( + padding: EdgeInsets.only( + left: 10, right: 10, bottom: 10), + child: Column( + children: [ + Row( + children: [ + Padding( + padding: EdgeInsets.only(left: 12.0), + child: Container( + width: 60, + height: 60, + child: Image.asset( + patient.gender == 1 + ? 'assets/images/male_avatar.png' + : 'assets/images/female_avatar.png', + fit: BoxFit.cover, + ), + ), + ), + SizedBox( + width: 10, + ), + Expanded( + child: Column( + children: [ + SERVICES_PATIANT2[int.parse( + patientType)] == + "patientArrivalList" + ? Container( + child: Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + children: [ + patient.patientStatusType == + 43 + ? AppText( + TranslationBase.of( + context) + .arrivedP, + color: Colors + .green, + fontWeight: + FontWeight + .bold, + fontFamily: + 'Poppins', + fontSize: 12, + ) + : AppText( + TranslationBase.of( + context) + .notArrived, + color: Colors + .red[800], + fontWeight: + FontWeight + .bold, + fontFamily: + 'Poppins', + fontSize: 12, + ), + patientType == '1' + ? AppText( + patient.startTime != + null + ? patient + .startTime + : '', + fontFamily: + 'Poppins', + fontWeight: + FontWeight + .w600, + ) + : AppText( + DateUtils.convertStringToDateFormat( + patient + .arrivedOn, + 'MM-dd-yyyy HH:mm'), + fontFamily: + 'Poppins', + fontWeight: + FontWeight + .w600, + ) + ], + )) + : SizedBox(), + Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + children: [ + RichText( + text: new TextSpan( + style: new TextStyle( + fontSize: 2.0 * SizeConfig.textMultiplier, + color: Colors.black), + children: [ + new TextSpan( + text: TranslationBase.of(context) + .fileNumber, + style: TextStyle( + fontSize: 14, + fontFamily: 'Poppins')), + new TextSpan( + text: patient.patientId.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + fontSize: 15)), + ], + ), + ), + + ], + ) + ], + ), + ) + ], + crossAxisAlignment: CrossAxisAlignment.start, + ), + ], + ), + ), + ], + ), + ),*/ ], ), ), diff --git a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart index 8a919709..7449d970 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -33,7 +33,7 @@ class MyReferralDetailScreen extends StatelessWidget { return BaseView( onModelReady: (model) => model.getPatientDetails( DateUtils.convertStringToDateFormat( - DateTime.now().subtract(Duration(days: 350)).toString(), + DateTime.now()/*.subtract(Duration(days: 350))*/.toString(), "yyyy-MM-dd"), DateUtils.convertStringToDateFormat( DateTime.now().toString(), "yyyy-MM-dd"), diff --git a/pubspec.yaml b/pubspec.yaml index 6bc1526a..1865d370 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -103,6 +103,7 @@ flutter: - assets/images/ - assets/images/dashboard/ - assets/images/login/ + - assets/images/patient/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware.