Merge branch 'patient_app_services' into 'development'

Patient app services

See merge request Cloud_Solution/doctor_app_flutter!553

lib/core/viewModel/patient-vital-sign-viewmodel.dart

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

lib/models/patient/patiant_info_model.dart

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

lib/screens/patients/profile/lab_result/labs_home_page.dart

@@ -69,7 +69,7 @@ class LabsHomePage extends StatelessWidget {
                     ],
                   ),
                 ),
-                if(patient.patientStatusType == 43)
+                if ( patient.patientStatusType!=null && patient.patientStatusType == 43)
                   Padding(
                     padding: const EdgeInsets.all(8.0),
                     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: () {
                   Navigator.push(
                     context,

lib/widgets/shared/doctor_card.dart

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