Mohammad Aljammal
|
b3ae86db31
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
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
|
5 years ago |
hussam al-habibeh
|
292bc2a97f
|
prescription changes
|
5 years ago |
hussam al-habibeh
|
c50a483663
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/core/service/patient_medical_file/prescription/prescription_service.dart
lib/core/viewModel/prescription_view_model.dart
lib/screens/prescription/add_prescription_form.dart
|
5 years ago |
hussam al-habibeh
|
cecc1a725d
|
pescription changes
|
5 years ago |
Mohammad Aljammal
|
74ded739c8
|
fix imports
|
5 years ago |
hussam al-habibeh
|
bc340693ba
|
project refactoring
|
5 years ago |
hussam al-habibeh
|
9457e04825
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/core/viewModel/PatientSearchViewModel.dart
lib/screens/patients/PatientsInPatientScreen.dart
lib/screens/patients/out_patient/out_patient_screen.dart
lib/screens/patients/patient_search/patient_search_result_screen.dart
lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
lib/screens/sick-leave/add-sickleave.dart
|
5 years ago |
Mohammad Aljammal
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
5 years ago |
hussam al-habibeh
|
4eba6d9f5a
|
Project refactoring
|
5 years ago |
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
5 years ago |
mosazaid
|
55895496e1
|
Merge branch 'design-changes' into development
|
5 years ago |
mosazaid
|
3d6b55681a
|
fix arabic and font style
|
5 years ago |
Haroon Amjad
|
0244334bb5
|
Update on store
|
5 years ago |
Haroon Amjad
|
53a610213c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/home/home_screen.dart
# lib/widgets/auth/login_form.dart
# lib/widgets/auth/verfiy_account.dart
|
5 years ago |
Mohammad Aljammal
|
1dd668ed70
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
dc9f75f0ca
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
60eb7adab1
|
hot fixes
|
5 years ago |
hussam al-habibeh
|
8a564b34ac
|
add procedure form update
|
5 years ago |
Zohaib Iqbal Kambrani
|
4b7688d620
|
showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
|
5 years ago |
Elham Rababah
|
56a5209d92
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
Conflicts:
lib/core/model/PatientSearchRequestModel.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/locator.dart
|
5 years ago |
Mohammad Aljammal
|
54166c0568
|
Merge branch 'in_patient_services' into 'development'
sick leave service
See merge request Cloud_Solution/doctor_app_flutter!593
|
5 years ago |
hussam al-habibeh
|
058a6d9e8c
|
sick leave service
|
5 years ago |
mosazaid
|
40c0f9f4a0
|
Merge branch 'development' into in-patient_re-design
|
5 years ago |
mosazaid
|
3e24278d89
|
in-patient re-design
|
5 years ago |
Mohammad Aljammal
|
357e01c846
|
hot fixes
|
5 years ago |
Elham Rababah
|
c062a14cc2
|
Merge branches 'development' and 'search_out_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
|
5 years ago |
Elham Rababah
|
cb67dcc9e1
|
first step from search
|
5 years ago |
Mohammad Aljammal
|
55c63c9531
|
fix Discharged Patient
|
5 years ago |
Mohammad Aljammal
|
57d22aca13
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
c9c18efd72
|
add in lab result get in and out patient
|
5 years ago |
mosazaid
|
ddc266416d
|
some functionality and design changes
|
5 years ago |
Mohammad Aljammal
|
f708689d00
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
29e2d962bc
|
Optimize imports
|
5 years ago |
Mohammad Aljammal
|
97c29945d0
|
Merge branch 'in_patient_services' into 'development'
procedure screen hot fix
See merge request Cloud_Solution/doctor_app_flutter!577
|
5 years ago |
hussam al-habibeh
|
9a2cd1719b
|
procedure screen hot fix
|
5 years ago |
mosazaid
|
5003b3a001
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
mosazaid
|
1b8e3eb895
|
some fixes
|
5 years ago |
Mohammad Aljammal
|
460a5293b9
|
add Discharged Patient
|
5 years ago |
Mohammad Aljammal
|
89e0107b86
|
Merge branch 'referral_in_patient' into 'development'
Referral in patient
See merge request Cloud_Solution/doctor_app_flutter!566
|
5 years ago |
Mohammad Aljammal
|
9b7bb687c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
cf4d2c6cb7
|
Merge branch 'progress_note' into 'development'
fix radiology_service
See merge request Cloud_Solution/doctor_app_flutter!565
|
5 years ago |
Elham Rababah
|
84ec110c82
|
fix radiology_service
|
5 years ago |
mosazaid
|
42d8fc0207
|
finish in-patient referral
|
5 years ago |
Mohammad Aljammal
|
3c224ece41
|
Add replay on referral patient and add the time on the vital signs
|
5 years ago |
Mohammad Aljammal
|
6d530301b6
|
done first page in ReferralInPatient
|
5 years ago |
mosazaid
|
596f518525
|
Merge branch 'development' into release-hot-fix
# Conflicts:
# lib/screens/patients/profile/patient_profile_screen.dart
# lib/widgets/patients/profile/PatientProfileButton.dart
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
mosazaid
|
bf9ce4694f
|
fix logic
|
5 years ago |
Elham Rababah
|
d4ddfa21e5
|
add the new logic
|
5 years ago |
Mohammad Aljammal
|
414ccdde49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
b37c607813
|
done the referral service
|
5 years ago |