diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 67917cb0..6888f1de 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -121,8 +121,8 @@ class BaseAppClient { // print("ProjectID :"); // print(body['ProjectID']); - debugPrint("URL : $url"); - debugPrint("Body : ${json.encode(body)}"); + // debugPrint("URL : $url"); + // debugPrint("Body : ${json.encode(body)}"); var asd = json.encode(body); var asd2; if (await Utils.checkConnection()) { diff --git a/lib/config/config.dart b/lib/config/config.dart index 3b502940..092ed2ae 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -317,7 +317,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 8.9; +const VERSION_ID = 9.1; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart index 9a14b2d8..fde1b4a3 100644 --- a/lib/core/model/radiology/final_radiology.dart +++ b/lib/core/model/radiology/final_radiology.dart @@ -141,7 +141,8 @@ class FinalRadiology { isRadMedicalReport = json['isRadMedicalReport']; isRecordFromVidaPlus = json['IsRecordFromVidaPlus']; invoiceType = json["InvoiceType"]; - } catch (e) { + } + catch (e) { print(e); } } diff --git a/lib/screens/patients/insurance_approval_screen_patient.dart b/lib/screens/patients/insurance_approval_screen_patient.dart index 302b0009..b2673ef4 100644 --- a/lib/screens/patients/insurance_approval_screen_patient.dart +++ b/lib/screens/patients/insurance_approval_screen_patient.dart @@ -91,6 +91,7 @@ class _InsuranceApprovalScreenNewState }, child: DoctorCardInsurance( patientOut: "In Patient", + onTap: (){}, profileUrl: model .insuranceApprovalInPatient[index] .doctorImage!, diff --git a/lib/screens/prescription/new_prescriptions_page.dart b/lib/screens/prescription/new_prescriptions_page.dart index e7facba7..d21b1cbe 100644 --- a/lib/screens/prescription/new_prescriptions_page.dart +++ b/lib/screens/prescription/new_prescriptions_page.dart @@ -27,9 +27,8 @@ class NewPrescriptionsPage extends StatelessWidget { bool isFromLiveCare = routeArgs['isFromLiveCare']; return BaseView( onModelReady: (model) async { - await model.getPrescriptionListNew( - mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : patient.appointmentNo); - await model.isPrincipalCovered(patient: patient); + await model.getPrescriptionListNew(mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : int.parse(patient.appointmentNo.toString())); + await model.isPrincipalCovered(patient: patient); }, builder: (_, model, w) => AppScaffold( baseViewModel: model, @@ -48,8 +47,6 @@ class NewPrescriptionsPage extends StatelessWidget { SizedBox( height: 12, ), - - Padding( padding: const EdgeInsets.all(8.0), child: Column( @@ -62,11 +59,18 @@ class NewPrescriptionsPage extends StatelessWidget { ], ), ), - !model.isPrincipalCovered_ ? Center(child: AppText(TranslationBase.of(context).principalCoveredOrNot,color: Colors.red, textAlign: TextAlign.center, )) :SizedBox(), - SizedBox(height: 20,), - if ((patient.patientStatusType != null && - patient.patientStatusType == 43) || - (isFromLiveCare && patient.appointmentNo != null)) + !model.isPrincipalCovered_ + ? Center( + child: AppText( + TranslationBase.of(context).principalCoveredOrNot, + color: Colors.red, + textAlign: TextAlign.center, + )) + : SizedBox(), + SizedBox( + height: 20, + ), + if ((patient.patientStatusType != null && patient.patientStatusType == 43) || (isFromLiveCare && patient.appointmentNo != null)) AddNewOrder( onTap: () { Navigator.push( diff --git a/pubspec.yaml b/pubspec.yaml index c0ca7a34..7737d33c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 4.3.5+1 +version: 1.4.14+1 environment: @@ -23,7 +23,6 @@ environment: #dependency_overrides: # intl: 0.17.0-nullsafety.2 - dependencies: flutter: sdk: flutter