diff --git a/lib/models/patient/patiant_info_model.dart b/lib/models/patient/patiant_info_model.dart index 8903791c..ec0b0bfb 100644 --- a/lib/models/patient/patiant_info_model.dart +++ b/lib/models/patient/patiant_info_model.dart @@ -175,25 +175,25 @@ class PatiantInformtion { startTime: json["startTime"], appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'], appointmentType: json['appointmentType'], - appointmentTypeId: json['appointmentTypeId'], + appointmentTypeId: json['appointmentTypeId']?? json['appointmentTypeid'], arrivedOn: json['arrivedOn'], clinicGroupId: json['clinicGroupId'], companyName: json['companyName'], dischargeStatus: json['dischargeStatus'], doctorDetails: json['doctorDetails'], endTime: json['endTime'], - episodeNo: json['episodeNo'] ?? json['EpisodeID'], + episodeNo: json['episodeNo'] ?? json['EpisodeID'] ?? json['EpisodeNo'], fallRiskScore: json['fallRiskScore'], isSigned: json['isSigned'], medicationOrders: json['medicationOrders'], nationality: json['nationality'] ?? json['NationalityNameN'], patientMRN: json['patientMRN'] ?? json['PatientMRN'], - visitType: json['visitType'] ?? json['visitType'], + visitType: json['visitType'] ?? json['visitType']?? json['visitType'], nationalityFlagURL: json['NationalityFlagURL'] ?? json['NationalityFlagURL'], patientStatusType: - json['patientStatusType'] ?? json['patientStatusType'], - visitTypeId: json['visitTypeId'] ?? json['visitTypeId'], + json['patientStatusType'] ?? json['PatientStatusType'], + visitTypeId: json['visitTypeId'] ?? json['visitTypeId'] ?? json['visitTypeid'], startTimes: json['StartTime'] ?? json['StartTime'], ); } diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index ddb0d3de..188744c3 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -31,7 +31,7 @@ class LabsHomePage extends StatelessWidget { arrivalType = routeArgs['arrivalType']; print(arrivalType); return BaseView( - onModelReady: (model) => model.getLabs(patient,isArrived: (patientType != null && patientType == '7' && patient.patientStatusType == 43)), + onModelReady: (model) => model.getLabs(patient,isArrived: ( patient.patientStatusType == 43)), builder: (context, ProcedureViewModel model, widget) => AppScaffold( baseViewModel: model, backgroundColor: Colors.grey[100], diff --git a/lib/screens/patients/profile/patient_profile_screen.dart b/lib/screens/patients/profile/patient_profile_screen.dart index db583482..277bc472 100644 --- a/lib/screens/patients/profile/patient_profile_screen.dart +++ b/lib/screens/patients/profile/patient_profile_screen.dart @@ -43,57 +43,47 @@ class PatientProfileScreen extends StatelessWidget { return BaseView( onModelReady: (patientViewModel) async { - PatientModel patientReq = PatientModel( - ProjectID: 0, - ClinicID: 0, - DoctorID: 0, - FirstName: "0", - MiddleName: "0", - LastName: "0", - PatientMobileNumber: "0", - PatientIdentificationID: "0", - PatientID: patient.patientId, - From: "0", - To: "0", - LanguageID: 2, - stamp: "2020-03-02T13:56:39.170Z", - IPAdress: "11.11.11.11", - VersionID: 1.2, - Channel: 9, - TokenID: "@dm!n", - SessionID: "5G0yXn0Jnq", - IsLoginForDoctorApp: true, - PatientOutSA: false); - - if(patient.patientType ==1 || patient.admissionNo==null || patient.admissionNo =="0" ) { - patientViewModel.getPatientList(patientReq, "1", isBusyLocal: false).then((response) { - if (response['MessageStatus'] == 1) { - - if (response['List_MyInPatient'] != null) { - - List patientList = - ModelResponse.fromJson(response['List_MyInPatient']) - .list; - patient.admissionNo = patientList[0].admissionNo; - patient.admissionDate = patientList[0].admissionDate; - } else { - - DrAppToastMsg.showErrorToast('No patient'); - } - + PatientModel patientReq = PatientModel( + ProjectID: 0, + ClinicID: 0, + DoctorID: 0, + FirstName: "0", + MiddleName: "0", + LastName: "0", + PatientMobileNumber: "0", + PatientIdentificationID: "0", + PatientID: patient.patientId, + From: "0", + To: "0", + LanguageID: 2, + stamp: "2020-03-02T13:56:39.170Z", + IPAdress: "11.11.11.11", + VersionID: 1.2, + Channel: 9, + TokenID: "@dm!n", + SessionID: "5G0yXn0Jnq", + IsLoginForDoctorApp: true, + PatientOutSA: false); + + if (patientType == "1" && + (patient.admissionNo == null || + patient.admissionNo == "0")) { + patientViewModel + .getPatientList(patientReq, "1", isBusyLocal: false) + .then((response) { + if (response['MessageStatus'] == 1) { + if (response['List_MyInPatient'] != null) { + List patientList = ModelResponse.fromJson(response['List_MyInPatient']).list; + patient.admissionNo = patientList[0].admissionNo; + patient.admissionDate = patientList[0].admissionDate; + } else { + DrAppToastMsg.showErrorToast('No patient'); } - - }).catchError((error) { - // setState(() { - // isLoading = false; - // }); - Helpers.showErrorToast(error.message); - //DrAppToastMsg.showErrorToast(error); - }); - - - - } + } + }).catchError((error) { + print(error); + }); + } }, builder: (_, patientViewModel, w) => AppScaffold( baseViewModel: patientViewModel, @@ -109,9 +99,9 @@ class PatientProfileScreen extends StatelessWidget { children: [ !isFromSearch && patientType == "1" ? PatientProfileHeaderNewDesignInPatient( - patient, patientType, arrivalType) + patient, patientType, arrivalType) : PatientProfileHeaderNewDesign( - patient, patientType, arrivalType), + patient, patientType, arrivalType), Expanded( child: Padding( padding: const EdgeInsets.all(16.0), @@ -120,8 +110,8 @@ class PatientProfileScreen extends StatelessWidget { children: [ isFromSearch ? ProfileMedicalInfoWidgetSearch( - patient: patient, - patientType: patientType, + patient: patient, + patientType: patientType, arrivalType: arrivalType, from: from, to: to, @@ -149,82 +139,89 @@ class PatientProfileScreen extends StatelessWidget { ], ), ), - if (int.parse(patientType) == 7 || - int.parse(patientType) == 6) - BaseView( - onModelReady: (model) async { - }, - builder: (_, model, w) => Positioned( - top: 175, - left: 20, - right: 20, - child: Row( - children: [ - Expanded(child: Container()), - if (patient.episodeNo == 0) - AppButton( - title: - "${TranslationBase.of(context).createNew}\n${TranslationBase.of(context).episode}", - color: patient.patientStatusType == 43 - ? Colors.red.shade700 - : Colors.grey.shade700, - fontColor: Colors.white, - vPadding: 8, - radius: 30, - hPadding: 20, - fontWeight: FontWeight.normal, - fontSize: 1.6, - icon: Image.asset( - "assets/images/create-episod.png", - color: Colors.white, - height: 30, + if (patient.patientStatusType !=null && patient.patientStatusType == 43 ) + BaseView( + onModelReady: (model) async {}, + builder: (_, model, w) => Positioned( + top: 175, + left: 20, + right: 20, + child: Row( + children: [ + Expanded(child: Container()), + if (patient.episodeNo == 0) + AppButton( + title: + "${TranslationBase.of(context).createNew}\n${TranslationBase.of(context).episode}", + color: patient.patientStatusType == 43 + ? Colors.red.shade700 + : Colors.grey.shade700, + fontColor: Colors.white, + vPadding: 8, + radius: 30, + hPadding: 20, + fontWeight: FontWeight.normal, + fontSize: 1.6, + icon: Image.asset( + "assets/images/create-episod.png", + color: Colors.white, + height: 30, + ), + onPressed: () async { + if (patient.patientStatusType == 43) { + PostEpisodeReqModel + postEpisodeReqModel = + PostEpisodeReqModel( + appointmentNo: + patient.appointmentNo, + patientMRN: + patient.patientMRN); + GifLoaderDialogUtils.showMyDialog( + context); + await model.postEpisode( + postEpisodeReqModel); + GifLoaderDialogUtils.hideDialog( + context); + patient.episodeNo = model.episodeID; + Navigator.of(context).pushNamed( + CREATE_EPISODE, + arguments: { + 'patient': patient + }); + } + }, + ), + if (patient.episodeNo != 0) + AppButton( + title: + "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}", + color: patient.patientStatusType == 43 + ? Colors.red.shade700 + : Colors.grey.shade700, + fontColor: Colors.white, + vPadding: 8, + radius: 30, + hPadding: 20, + fontWeight: FontWeight.normal, + fontSize: 1.6, + icon: Image.asset( + "assets/images/modilfy-episode.png", + color: Colors.white, + height: 30, + ), + onPressed: () { + if (patient.patientStatusType == + 43) { + Navigator.of(context).pushNamed( + UPDATE_EPISODE, + arguments: { + 'patient': patient + }); + } + }), + ], ), - onPressed: () async { - if (patient.patientStatusType == 43) { - PostEpisodeReqModel postEpisodeReqModel = - PostEpisodeReqModel( - appointmentNo: - patient.appointmentNo, - patientMRN: patient.patientMRN); - GifLoaderDialogUtils.showMyDialog(context); - await model - .postEpisode(postEpisodeReqModel); - GifLoaderDialogUtils.hideDialog(context); - patient.episodeNo = model.episodeID; - Navigator.of(context).pushNamed( - CREATE_EPISODE, - arguments: {'patient': patient}); - } - }, - ), - if (patient.episodeNo != 0) - AppButton( - title: - "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}", - color: patient.patientStatusType == 43 - ? Colors.red.shade700 - : Colors.grey.shade700, - fontColor: Colors.white, - vPadding: 8, - radius: 30, - hPadding: 20, - fontWeight: FontWeight.normal, - fontSize: 1.6, - icon: Image.asset( - "assets/images/modilfy-episode.png", - color: Colors.white, - height: 30, - ), - onPressed: () { - if (patient.patientStatusType == 43) { - Navigator.of(context).pushNamed( - UPDATE_EPISODE, - arguments: {'patient': patient}); - } - }), - ], - ), - )), + )), ], ), ), @@ -254,4 +251,3 @@ class AvatarWidget extends StatelessWidget { ); } } -