Commit Graph

122 Commits (46698a43820dab91674746cf99901ea04b589181)

Author SHA1 Message Date
Elham Rababh 943463b1d9 add pagination to doctor replay 3 years ago
hussam al-habibeh 528e16c3dc lab result & radiolgy fix 3 years ago
Mohammad Aljammal 94f7d7773f fix issue in login and inpatient 3 years ago
hussam al-habibeh ab584c792a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap
 Conflicts:
	lib/config/config.dart
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
3 years ago
hussam al-habibeh 36786a3079 chinging chief complaint in the soap 3 years ago
Mohammad Aljammal 243108e81a Apply the new authentication logic 3 years ago
hussam al-habibeh 64a7aca228 adding google anlyatic to doctor app 3 years ago
Mohammad Aljammal 3ee0acbf6e Add Analytics Service 3 years ago
mosazaid d839fd3545 outpatirnt referral changes 3 years ago
hussam al-habibeh 07835aaa1b medical report changes 3 years ago
Elham Rababah 9da1bff723 first step form sort 3 years ago
mosazaid 13ee7f6491 Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android
 Conflicts:
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/util/VideoChannel.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
3 years ago
mosazaid 61b0f6c22c Merge branch 'development' into video-streaming-android 3 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 3 years ago
hussam al-habibeh 142fbb93fd Referrel Doctor reply 3 years ago
mosazaid e76ecf172f video-straming-android-changes 3 years ago
Zohaib Iqbal Kambrani 693f57a13e Merge branch 'development' into ZohaibKambrani
* development: (102 commits)
  prescription changes
  pescription changes
  fix imports
  project refactoring
  working on feature medical profile
  prescription changes
  hot fix
  hot fix
  hot fix
  refactoring
  hot fix
  hot fix
  add prescription form changes
  Add Medical Report Page
  hot fix
  hot fix
  add prescription changes
  fix in note and AddReplayOnReferralPatient
  Add Prescription changes
  prescription changes
  ...

# Conflicts:
#	lib/screens/patients/DischargedPatientPage.dart
#	lib/screens/patients/ReferralDischargedPatientDetails.dart
#	lib/screens/patients/insurance_approvals_details.dart
#	lib/screens/patients/patients_screen.dart
#	lib/screens/patients/profile/note/progress_note_screen.dart
#	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
#	lib/screens/prescription/update_prescription_form.dart
#	lib/screens/sick-leave/add-sickleave.dart
#	lib/widgets/patients/PatientCard.dart
#	pubspec.lock
3 years ago
Elham Rababah d57b331df2 add timer 3 years ago
hussam al-habibeh c800219428 Live Care Is Login Service 3 years ago
mosazaid ea0658c05c Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/viewModel/procedure_View_model.dart
3 years ago
Mohammad Aljammal ad74ff00dc fix issues in android and add ChangeCallStatus services in IOS 3 years ago
hussam al-habibeh e068009527 prescription form 3 years ago
Mohammad Aljammal 08d72ed121 Merge branch 'prescription_changes' into 'development'
Procedure template service

See merge request Cloud_Solution/doctor_app_flutter!680
3 years ago
hussam al-habibeh d50740b9b9 Procedure template service 3 years ago
mosazaid 67e0cac742 add livecare to home 3 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 3 years ago
hussam al-habibeh 3801d7b59a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
3 years ago
Elham Rababah 8cac9b6fe9 add rich editor 3 years ago
hussam al-habibeh 6b6243232c Procedure template service 3 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 4 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
4 years ago
mosazaid a34db1b00c Merge branch 'development' into fridayf-fix-bug
# Conflicts:
#	lib/util/translations_delegate_base.dart
4 years ago
Sultan Khan b52ba524a3 updated 4 years ago
hussam al-habibeh 6a33f60bad hot fixes 4 years ago
Sultan Khan 0ea66c4483 bug fixes 4 years ago
Mohammad Aljammal 327e058fbd fix design issues and merge conflict 4 years ago
hussam al-habibeh 92d33abac0 adding Doctor image in medical file & adding DoctorApp new Icons 4 years ago
Mohammad Aljammal fa1a5c7099 hot fix 4 years ago
hussam al-habibeh d1a6c2a703 adding add prescription form 4 years ago
Mohammad Aljammal 2bd505290d fix design 4 years ago
hussam al-habibeh db2c086ffd Medical Report New Design 4 years ago
mosazaid a13dd07734 Merge branch 'development' into patients-new-design
# Conflicts:
#	pubspec.lock
4 years ago
mosazaid 5673349310 pupsc lock 4 years ago
Mohammad Aljammal 7dae41513f Add insurance approval services 4 years ago
Mohammad Aljammal e515265f11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 0742d64428 add lab result services 4 years ago
hussam al-habibeh 3928165570 get Prescription history fix 4 years ago
Mohammad Aljammal e7e4aad962 add ECG service 4 years ago
hussam al-habibeh 983f03108f adding prescription history & Medical file for all patient types 4 years ago
Sultan Khan 3f7961b50c dashboard sreen updated 4 years ago