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
|
6 years ago |
|
mosazaid
|
bf9ce4694f
|
fix logic
|
6 years ago |
Elham Rababah
|
b2a2884586
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
6 years ago |
hussam al-habibeh
|
1d09bcf251
|
hot fixes
|
6 years ago |
|
Elham Rababah
|
d4ddfa21e5
|
add the new logic
|
6 years ago |
Mohammad Aljammal
|
0ded3a5a03
|
hot fixes
|
6 years ago |
|
Mohammad Aljammal
|
9e8aef0835
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
6 years ago |
Mohammad Aljammal
|
8350d68397
|
Merge branch 'progress_note' into 'development'
add condition
See merge request Cloud_Solution/doctor_app_flutter!545
|
6 years ago |
|
Mohammad Aljammal
|
414ccdde49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
6 years ago |
|
Mohammad Aljammal
|
b37c607813
|
done the referral service
|
6 years ago |
Sultan Khan
|
426aa03aa5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
b5503a8411
|
fixes
|
6 years ago |
|
Elham Rababah
|
79037d8fc7
|
add condition
|
6 years ago |
|
Mohammad Aljammal
|
650a949c6a
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!542
|
6 years ago |
|
Elham Rababah
|
9d780f72b4
|
remove commented code
|
6 years ago |
|
Mohammad Aljammal
|
36189adf94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/shared/doctor_card.dart
|
6 years ago |
|
Mohammad Aljammal
|
ae8882fbae
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!539
|
6 years ago |
|
Elham Rababah
|
8d7fef3db9
|
fix some issue on progress_note_screen
|
6 years ago |
|
hussam al-habibeh
|
e3102b3f5e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
|
6 years ago |
|
hussam al-habibeh
|
94e598c5f2
|
Insurance Approval In Patient
|
6 years ago |
|
mosazaid
|
2bf003c100
|
Merge branch 'development' into in-patient-changes
|
6 years ago |
|
mosazaid
|
33545d1180
|
work on in paitent referral
|
6 years ago |
|
Mohammad Aljammal
|
fd790978c4
|
add new referral service
|
6 years ago |
|
Sultan Khan
|
608198762d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
d0a39ca3d4
|
fixes
|
6 years ago |
|
Elham Rababah
|
acc3ecdbbe
|
cancel progress_note part
|
6 years ago |
|
Elham Rababah
|
4a263dda8a
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/config/config.dart
|
6 years ago |
|
Elham Rababah
|
82285ccf39
|
show progress_note part
|
6 years ago |
|
Mohammad Aljammal
|
e4aae762cc
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!536
|
6 years ago |
|
Sultan Khan
|
feef001323
|
bug fixes
|
6 years ago |
|
Elham Rababah
|
f2011301c6
|
update progress_note
|
6 years ago |
|
mosazaid
|
9aecc6fbdb
|
add lap results to inpatient and some changes on patient profile
|
6 years ago |
|
Elham Rababah
|
0909879ccf
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
6 years ago |
|
Elham Rababah
|
5199104d7a
|
show progress_note
|
6 years ago |
|
mosazaid
|
b6a6f16b31
|
add vital sign inPatient
|
6 years ago |
|
mosazaid
|
37edd8cef9
|
add in-patient cards and header
|
6 years ago |
|
Elham Rababah
|
f4ce9eb004
|
Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology
|
6 years ago |
|
Elham Rababah
|
67abe2a5e7
|
first step from radiology
|
6 years ago |
|
Mohammad Aljammal
|
a95bb8be04
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!529
|
6 years ago |
|
Sultan Khan
|
5afb44adfd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Mohammad Aljammal
|
0260b92f24
|
Merge branch 'soap_refactor' into 'development'
Soap refactor
See merge request Cloud_Solution/doctor_app_flutter!528
|
6 years ago |
|
Sultan Khan
|
3aabb1537c
|
in patient
|
6 years ago |
|
Elham Rababah
|
bd01624f5a
|
create New order widget
|
6 years ago |
|
mosazaid
|
4b3c5b9f37
|
Merge branch 'development' into app-changes
|
6 years ago |
|
mosazaid
|
dde8d9aa48
|
design hot fixes
|
6 years ago |
|
mosazaid
|
54482bfb1d
|
hot fix
|
6 years ago |
|
Sultan Khan
|
6f52c9a7fd
|
fixe
|
6 years ago |
|
hussam al-habibeh
|
89451a3c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
Conflicts:
lib/screens/medical-file/medical_file_page.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
6 years ago |
|
mosazaid
|
72bb64b460
|
finish working on app text widget
|
6 years ago |
|
mosazaid
|
8ae0a91c05
|
working on text widget
|
6 years ago |