bug fixes

ipd-changes-for-vida-plus
Sultan Khan 3 weeks ago
parent bff09259d5
commit 6c350960fd

@ -413,7 +413,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 10.2; const VERSION_ID = 20.5;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -683,7 +683,7 @@ const Map<String, Map<String, String>> localizedValues = {
"progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"}, "progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"},
"addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"}, "addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"},
"createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "}, "createdBy": {"en": "Created By : ", "ar": "أضيفت عن طريق: "},
"createdOn": {"en": "Created On :", "ar": "تم إنشاؤه في: "}, "createdOn": {"en": "Created On :", "ar": "تم إنشاؤه في: "},
"riskScore": {"en": "Risk Score :", "ar": "درجة المخاطر"}, "riskScore": {"en": "Risk Score :", "ar": "درجة المخاطر"},
"editedBy": {"en": "Edited By :", "ar": "عدلت من : "}, "editedBy": {"en": "Edited By :", "ar": "عدلت من : "},

@ -75,7 +75,7 @@ class GetDiagnosisForInPatientResponseModel {
createdOn = json['createdOn']; createdOn = json['createdOn'];
editedBy = json['EditedBy']; editedBy = json['EditedBy'];
editedOn = json['EditedOn']; editedOn = json['EditedOn'];
createdByName = json['createdBy']; createdByName =json['createdByName'] == null ? json['createdBy'] : json['createdByName'] ;
editedByName = json['EditedByName']; editedByName = json['EditedByName'];
} }
} }

@ -91,7 +91,7 @@ class InsuranceApprovalModel {
rceiptOn = json['ReceiptOn']; rceiptOn = json['ReceiptOn'];
expiryDate = json['ExpiryDate']; expiryDate = json['ExpiryDate'];
//companyName = json['CompanyName']; //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']; approvalStatusDescption = json['ApprovalStatusDescption'];
approvalNo = json['ApprovalNo']; approvalNo = json['ApprovalNo'];
patientDescription = json['IsInOutPatientDescription']; patientDescription = json['IsInOutPatientDescription'];
@ -143,7 +143,7 @@ class InsuranceApprovalModel {
data['TokenID'] = this.tokenID; data['TokenID'] = this.tokenID;
data['DoctorImageURL'] = this.doctorImage; data['DoctorImageURL'] = this.doctorImage;
data['ProjectName'] = this.projectName; data['ProjectName'] = this.projectName;
data['UnUsedCount'] = this.unUsedCount;
data['PatientTypeID'] = this.patientTypeID; data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType; data['PatientType'] = this.patientType;
if (appointmentNo == null) { if (appointmentNo == null) {

@ -494,9 +494,10 @@ class LstProcedure {
String? projectName; String? projectName;
String? setupID; String? setupID;
String? dispalyName; String? dispalyName;
String? cptCode;
LstProcedure( 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<String, dynamic> json) { LstProcedure.fromJson(Map<String, dynamic> json) {
appointmentNo = json['AppointmentNo']; appointmentNo = json['AppointmentNo'];
@ -510,6 +511,7 @@ class LstProcedure {
projectName = json['ProjectName']; projectName = json['ProjectName'];
setupID = json['SetupID']; setupID = json['SetupID'];
dispalyName = json['dispalyName']; dispalyName = json['dispalyName'];
cptCode = json['CptCode'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -525,6 +527,7 @@ class LstProcedure {
data['ProjectName'] = this.projectName; data['ProjectName'] = this.projectName;
data['SetupID'] = this.setupID; data['SetupID'] = this.setupID;
data['dispalyName'] = this.dispalyName; data['dispalyName'] = this.dispalyName;
data['CptCode'] = this.dispalyName;
return data; return data;
} }
} }

@ -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/screens/base/base_view.dart';
import 'package:doctor_app_flutter/utils/date-utils.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/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/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_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -414,11 +415,21 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
AppText( AppText(
'CPT Code : ', 'CPT Code : ',
), ),
if(Utils.isVidaPlusProject(
projectViewModel,
model.medicalFileList[0].entityList![0].timelines![encounterNumber!].timeLineEvents![0].consulations![0].lstProcedure![index].projectID!,
))
AppText( 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(), .toString(),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), )
else
AppText(
model.medicalFileList[0].entityList![0].timelines![encounterNumber!].timeLineEvents![0].consulations![0].lstProcedure![index].patientID
.toString(),
fontWeight: FontWeight.w700,
)
], ],
), ),
SizedBox( SizedBox(

@ -131,7 +131,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
index] index]
.createdByName .createdByName
.toString() ?? .toString() ??
'', '' ,
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
fontSize: 12, fontSize: 12,

@ -114,7 +114,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
children: [ children: [
AppText( AppText(
model.reservationList[index].createdOn != null 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) isArabic: projectViewModel.isArabic, isMonthShort: true)
: AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(), isArabic: projectViewModel.isArabic), : AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(), isArabic: projectViewModel.isArabic),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -122,7 +122,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
), ),
AppText( AppText(
model.reservationList[index].createdOn != null 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()), : AppDateUtils.getHour(DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,

@ -104,7 +104,7 @@ class _EntityListCheckboxSearchWidgetState extends State<EntityListCheckboxSearc
Widget _buildProcedureItem(EntityList historyInfo) { Widget _buildProcedureItem(EntityList historyInfo) {
return ExpansionTile( return ExpansionTile(
key: PageStorageKey<String>(historyInfo.procedureId.toString()), key: ValueKey('${historyInfo.procedureId}_${historyInfo.procedureName}'),
title: Row( title: Row(
children: [ children: [
Checkbox( Checkbox(
@ -252,9 +252,9 @@ class _EntityListCheckboxSearchWidgetState extends State<EntityListCheckboxSearc
widget.model.filterSearchResults( widget.model.filterSearchResults(
procedureName.text, widget.masterList, items); procedureName.text, widget.masterList, items);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) { // if (mounted) {
setState(() {}); // setState(() {});
} // }
}); });
} }
}, },

Loading…
Cancel
Save