Merge branch 'patient_app_services' into 'development'

Patient app services

See merge request Cloud_Solution/doctor_app_flutter!553
merge-requests/554/merge
Mohammad Aljammal 5 years ago
commit d0149c2691

@ -30,7 +30,7 @@ const Map<String, Map<String, String>> localizedValues = {
'ar': 'ملاحضات وتفاصيل العيادة' 'ar': 'ملاحضات وتفاصيل العيادة'
}, },
'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'}, 'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'},
'myOutPatient': {'en': 'My Out Patients', 'ar': 'المريض الخارجي'}, 'myOutPatient': {'en': 'My OutPatients', 'ar': 'المريض الخارجي'},
'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'}, 'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'},
'searchAbout': {'en': 'Search', 'ar': 'البحث عن'}, 'searchAbout': {'en': 'Search', 'ar': 'البحث عن'},
@ -47,7 +47,7 @@ const Map<String, Map<String, String>> localizedValues = {
'radiology': {'en': 'Radiology', 'ar': 'الأشعة'}, 'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
'service': {'en': 'Service', 'ar': 'خدمة'}, 'service': {'en': 'Service', 'ar': 'خدمة'},
'referral': {'en': 'Referral', 'ar': 'الإحالة'}, 'referral': {'en': 'Referral', 'ar': 'الإحالة'},
'inPatient': {'en': 'My In Patients', 'ar': 'المريض الداخلي'}, 'inPatient': {'en': 'My InPatients', 'ar': 'المريض الداخلي'},
'operations': {'en': 'Operations', 'ar': 'عمليات'}, 'operations': {'en': 'Operations', 'ar': 'عمليات'},
'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'}, 'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'}, 'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'},

@ -47,11 +47,11 @@ class VitalSignsViewModel extends BaseViewModel {
to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
} }
if(isInPatient){ // if(isInPatient){
await _vitalSignService.getInPatientVitalSignHistory(patient); await _vitalSignService.getInPatientVitalSignHistory(patient);
}else { // }else {
await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); // await _vitalSignService.getPatientVitalSignsHistory(patient, from, to);
} // }
if (_vitalSignService.hasError) { if (_vitalSignService.hasError) {
error = _vitalSignService.error; error = _vitalSignService.error;

@ -176,7 +176,7 @@ class PatiantInformtion {
appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'], appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'],
appointmentType: json['appointmentType'], appointmentType: json['appointmentType'],
appointmentTypeId: json['appointmentTypeId']?? json['appointmentTypeid'], appointmentTypeId: json['appointmentTypeId']?? json['appointmentTypeid'],
arrivedOn: json['arrivedOn'], arrivedOn: json['arrivedOn'] ?? json['ArrivedOn'],
clinicGroupId: json['clinicGroupId'], clinicGroupId: json['clinicGroupId'],
companyName: json['companyName'], companyName: json['companyName'],
dischargeStatus: json['dischargeStatus'], dischargeStatus: json['dischargeStatus'],

@ -69,7 +69,7 @@ class LabsHomePage extends StatelessWidget {
], ],
), ),
), ),
if(patient.patientStatusType == 43) if ( patient.patientStatusType!=null && patient.patientStatusType == 43)
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Column( child: Column(
@ -89,7 +89,7 @@ class LabsHomePage extends StatelessWidget {
], ],
), ),
), ),
if (patientType != null && patientType == '7' && patient.patientStatusType == 43) if ( patient.patientStatusType!=null && patient.patientStatusType == 43)
AddNewOrder( onTap: () { AddNewOrder( onTap: () {
Navigator.push( Navigator.push(
context, context,

@ -110,7 +110,7 @@ class DoctorCard extends StatelessWidget {
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).orderNo + TranslationBase.of(context).orderNo +
": ", " ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
@ -126,7 +126,7 @@ class DoctorCard extends StatelessWidget {
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.invoiceNo + .invoiceNo +
": ", " ",
fontSize: 14, fontSize: 14,
color: Colors.grey[500], color: Colors.grey[500],
), ),

Loading…
Cancel
Save