diff --git a/lib/config/config.dart b/lib/config/config.dart index c71bbf6f..77fd2047 100755 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -413,7 +413,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 = 10.2; +const VERSION_ID = 20.5; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 662a681c..65ca07a7 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -683,7 +683,7 @@ const Map> localizedValues = { "progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"}, "addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"}, - "createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "}, + "createdBy": {"en": "Created By : ", "ar": "أضيفت عن طريق: "}, "createdOn": {"en": "Created On :", "ar": "تم إنشاؤه في: "}, "riskScore": {"en": "Risk Score :", "ar": "درجة المخاطر"}, "editedBy": {"en": "Edited By :", "ar": "عدلت من : "}, diff --git a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart index b684c180..2f8f2b5a 100644 --- a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart +++ b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart @@ -75,7 +75,7 @@ class GetDiagnosisForInPatientResponseModel { createdOn = json['createdOn']; editedBy = json['EditedBy']; editedOn = json['EditedOn']; - createdByName = json['createdBy']; + createdByName =json['createdByName'] == null ? json['createdBy'] : json['createdByName'] ; editedByName = json['EditedByName']; } } diff --git a/lib/core/model/insurance/insurance_approval.dart b/lib/core/model/insurance/insurance_approval.dart index 8468919e..1ab8731a 100644 --- a/lib/core/model/insurance/insurance_approval.dart +++ b/lib/core/model/insurance/insurance_approval.dart @@ -91,7 +91,7 @@ class InsuranceApprovalModel { rceiptOn = json['ReceiptOn']; expiryDate = json['ExpiryDate']; //companyName = json['CompanyName']; - unUsedCount = json['TotaUnUsedCount']; + unUsedCount = json['UnUsedCount']; //change this as requested backend team since they are using unused count for patient app so changed this from total count to unusedcount approvalStatusDescption = json['ApprovalStatusDescption']; approvalNo = json['ApprovalNo']; patientDescription = json['IsInOutPatientDescription']; @@ -143,7 +143,7 @@ class InsuranceApprovalModel { data['TokenID'] = this.tokenID; data['DoctorImageURL'] = this.doctorImage; data['ProjectName'] = this.projectName; - + data['UnUsedCount'] = this.unUsedCount; data['PatientTypeID'] = this.patientTypeID; data['PatientType'] = this.patientType; if (appointmentNo == null) { diff --git a/lib/core/model/medical_report/medical_file_model.dart b/lib/core/model/medical_report/medical_file_model.dart index c903a16c..0628dcaf 100644 --- a/lib/core/model/medical_report/medical_file_model.dart +++ b/lib/core/model/medical_report/medical_file_model.dart @@ -494,9 +494,10 @@ class LstProcedure { String? projectName; String? setupID; String? dispalyName; + String? cptCode; LstProcedure( - {this.appointmentNo, this.episodeID, this.orderDate, this.patientID, this.patientType, this.procName, this.procedureId, this.projectID, this.projectName, this.setupID, this.dispalyName}); + {this.appointmentNo, this.episodeID, this.orderDate, this.patientID, this.patientType, this.procName, this.procedureId, this.projectID, this.projectName, this.setupID, this.dispalyName, this.cptCode}); LstProcedure.fromJson(Map json) { appointmentNo = json['AppointmentNo']; @@ -510,6 +511,7 @@ class LstProcedure { projectName = json['ProjectName']; setupID = json['SetupID']; dispalyName = json['dispalyName']; + cptCode = json['CptCode']; } Map toJson() { @@ -525,6 +527,7 @@ class LstProcedure { data['ProjectName'] = this.projectName; data['SetupID'] = this.setupID; data['dispalyName'] = this.dispalyName; + data['CptCode'] = this.dispalyName; return data; } } diff --git a/lib/screens/medical-file/medical_file_details.dart b/lib/screens/medical-file/medical_file_details.dart index 9d4f8668..a2be5a5b 100644 --- a/lib/screens/medical-file/medical_file_details.dart +++ b/lib/screens/medical-file/medical_file_details.dart @@ -4,6 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -414,11 +415,21 @@ class _MedicalFileDetailsState extends State { AppText( 'CPT Code : ', ), + if(Utils.isVidaPlusProject( + projectViewModel, + model.medicalFileList[0].entityList![0].timelines![encounterNumber!].timeLineEvents![0].consulations![0].lstProcedure![index].projectID!, + )) AppText( - model.medicalFileList[0].entityList![0].timelines![encounterNumber!].timeLineEvents![0].consulations![0].lstProcedure![index].patientID + model.medicalFileList[0].entityList![0].timelines![encounterNumber!].timeLineEvents![0].consulations![0].lstProcedure![index].cptCode .toString(), fontWeight: FontWeight.w700, - ), + ) + else + AppText( + model.medicalFileList[0].entityList![0].timelines![encounterNumber!].timeLineEvents![0].consulations![0].lstProcedure![index].patientID + .toString(), + fontWeight: FontWeight.w700, + ) ], ), SizedBox( diff --git a/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart b/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart index 77d18c17..46f7584b 100644 --- a/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart +++ b/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart @@ -131,7 +131,7 @@ class _ProgressNoteState extends State { index] .createdByName .toString() ?? - '', + '' , fontWeight: FontWeight.w600, fontSize: 12, diff --git a/lib/screens/patients/profile/operation_report/operation_report.dart b/lib/screens/patients/profile/operation_report/operation_report.dart index 340c5e74..208e08e3 100644 --- a/lib/screens/patients/profile/operation_report/operation_report.dart +++ b/lib/screens/patients/profile/operation_report/operation_report.dart @@ -114,7 +114,7 @@ class _ProgressNoteState extends State { children: [ AppText( model.reservationList[index].createdOn != null - ? AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.reservationList[index].createdOn!), + ? AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.reservationList[index].oTReservationDate!), isArabic: projectViewModel.isArabic, isMonthShort: true) : AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(), isArabic: projectViewModel.isArabic), fontWeight: FontWeight.w600, @@ -122,7 +122,7 @@ class _ProgressNoteState extends State { ), AppText( model.reservationList[index].createdOn != null - ? AppDateUtils.getHour(AppDateUtils.getDateTimeFromServerFormat(model.reservationList[index].createdOn!)) + ? AppDateUtils.getHour(AppDateUtils.getDateTimeFromServerFormat(model.reservationList[index].oTReservationDate!)) : AppDateUtils.getHour(DateTime.now()), fontWeight: FontWeight.w600, fontSize: 14, diff --git a/lib/screens/procedures/entity_list_checkbox_search_widget.dart b/lib/screens/procedures/entity_list_checkbox_search_widget.dart index 59579424..481cb3e8 100644 --- a/lib/screens/procedures/entity_list_checkbox_search_widget.dart +++ b/lib/screens/procedures/entity_list_checkbox_search_widget.dart @@ -104,7 +104,7 @@ class _EntityListCheckboxSearchWidgetState extends State(historyInfo.procedureId.toString()), + key: ValueKey('${historyInfo.procedureId}_${historyInfo.procedureName}'), title: Row( children: [ Checkbox( @@ -252,9 +252,9 @@ class _EntityListCheckboxSearchWidgetState extends State