Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

updates & fixes

Browse Source
update_flutter_3.24_pharmacy_ntervention
haroon amjad 1 year ago
parent 6c0debaf5e
commit 9fb6997e1d
9 changed files with 448 additions and 675 deletions
Show Stats Download Patch File Download Diff File

4
lib/config/config.dart
Unescape Escape View File

@ -7,11 +7,11 @@ const ONLY_DATE = "[0-9/]";
const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/'; const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
// const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/'; // const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/';
// const BASE_URL = 'https://hmgwebservices.com/'; const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://webservices.hmg.com/'; // const BASE_URL = 'https://webservices.hmg.com/';
// const BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; //Vida Plus URL // const BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; //Vida Plus URL

4
lib/core/model/radiology/final_radiology.dart
Unescape Escape View File

@ -45,7 +45,7 @@ class FinalRadiology {
bool? isRadMedicalReport; bool? isRadMedicalReport;
bool? isLiveCareAppodynamicment; bool? isLiveCareAppodynamicment;
bool? isRecordFromVidaPlus; bool? isRecordFromVidaPlus;
String? invoiceType; dynamic invoiceType;
FinalRadiology( FinalRadiology(
{this.setupID, {this.setupID,
@ -105,7 +105,7 @@ class FinalRadiology {
doctorID = json['DoctorID']; doctorID = json['DoctorID'];
clinicID = json['ClinicID']; clinicID = json['ClinicID'];
orderDate = AppDateUtils.convertStringToDate(json['OrderDate']); orderDate = AppDateUtils.convertStringToDate(json['OrderDate']);
reportDate = AppDateUtils.convertStringToDate(json['ReportDate']); reportDate = AppDateUtils.convertStringToDate(json['ReadOn']);
reportData = json['ReportData']; reportData = json['ReportData'];
imageURL = json['ImageURL']; imageURL = json['ImageURL'];
procedureID = json['ProcedureID']; procedureID = json['ProcedureID'];

1
lib/screens/patients/insurance_approval_screen_patient.dart
Unescape Escape View File

@ -185,6 +185,7 @@ class _InsuranceApprovalScreenNewState
'', '',
branch2: model branch2: model
.insuranceApproval[index].projectName!, .insuranceApproval[index].projectName!,
onTap: (){},
), ),
), ),
), ),

415
lib/screens/patients/insurance_approvals_details.dart
Unescape Escape View File

@ -38,7 +38,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map; // final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
return BaseView<InsuranceViewModel>( return BaseView<InsuranceViewModel>(
onModelReady: (model) => model.insuranceApprovalInPatient.length == 0 onModelReady: (model) => model.insuranceApprovalInPatient.length == 0
@ -48,8 +48,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
? (model) => model.getInsuranceApproval(patient, appointmentNo: patient!.appointmentNo, projectId: patient!.projectId) ? (model) => model.getInsuranceApproval(patient, appointmentNo: patient!.appointmentNo, projectId: patient!.projectId)
: (model) => model.getInsuranceApproval(patient) : (model) => model.getInsuranceApproval(patient)
: null, : null,
builder: (BuildContext context, InsuranceViewModel model, Widget? child) => builder: (BuildContext context, InsuranceViewModel model, Widget? child) => AppScaffold(
AppScaffold(
isShowAppBar: true, isShowAppBar: true,
baseViewModel: model, baseViewModel: model,
appBar: PatientProfileAppBar(patient!), appBar: PatientProfileAppBar(patient!),
@ -81,45 +80,25 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
model model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption != null
.insuranceApprovalInPatient[ ? model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption ?? ""
indexInsurance]
.approvalStatusDescption !=
null
? model
.insuranceApprovalInPatient[
indexInsurance]
.approvalStatusDescption ??
""
: "", : "",
color: model color: model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption != null
.insuranceApprovalInPatient[ ? "${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" == "Approved" ||
indexInsurance] "${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" == "تمت الموافقة"
.approvalStatusDescption !=
null
? "${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" ==
"Approved" ||
"${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" ==
"تمت الموافقة"
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: Color(0xffD02127) : Color(0xffD02127)
: Color(0xffD02127), : Color(0xffD02127),
letterSpacing: -0.4, letterSpacing: -0.4,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7,
.getTextMultiplierBasedOnWidth() *
2.7,
), ),
], ],
), ),
Row( Row(
children: [ children: [
AppText( AppText(
model model.insuranceApprovalInPatient[indexInsurance].doctorName!.toUpperCase(),
.insuranceApprovalInPatient[
indexInsurance]
.doctorName!
.toUpperCase(),
color: Color(0xff2E303A), color: Color(0xff2E303A),
fontSize: 16, fontSize: 16,
letterSpacing: -0.64, letterSpacing: -0.64,
@ -128,105 +107,59 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
], ],
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(horizontal: 8.0),
horizontal: 8.0),
child: Row( child: Row(
children: [ children: [
Column( Column(
children: [ children: [
Container( Container(
height: MediaQuery.of(context) height: MediaQuery.of(context).size.height * 0.065,
.size width: MediaQuery.of(context).size.height * 0.065,
.height *
0.065,
width: MediaQuery.of(context)
.size
.height *
0.065,
child: CircleAvatar( child: CircleAvatar(
radius: SizeConfig radius: SizeConfig.imageSizeMultiplier! * 12,
.imageSizeMultiplier! *
12,
// radius: (52) // radius: (52)
child: ClipRRect( child: ClipRRect(
borderRadius: borderRadius: BorderRadius.circular(50),
BorderRadius.circular(
50),
child: Image.network( child: Image.network(
model model.insuranceApprovalInPatient[indexInsurance].doctorImage!,
.insuranceApprovalInPatient[
indexInsurance]
.doctorImage!,
fit: BoxFit.fill, fit: BoxFit.fill,
width: 700, width: 700,
), ),
), ),
backgroundColor: backgroundColor: Colors.transparent,
Colors.transparent,
), ),
), ),
], ],
), ),
Expanded( Expanded(
child: Padding( child: Padding(
padding: padding: const EdgeInsets.symmetric(horizontal: 8.0),
const EdgeInsets.symmetric(
horizontal: 8.0),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
//mainAxisAlignment: MainAxisAlignment.center, //mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
height: 25.0, height: 25.0,
), ),
CustomRow( CustomRow(
label: TranslationBase.of( label: TranslationBase.of(context).clinic + ": ",
context) value: model.insuranceApprovalInPatient[indexInsurance].clinicName!,
.clinic +
": ",
value: model
.insuranceApprovalInPatient[
indexInsurance]
.clinicName!,
), ),
CustomRow( CustomRow(
label: TranslationBase.of( label: TranslationBase.of(context).approvalNo + ": ",
context) value: model.insuranceApprovalInPatient[indexInsurance].approvalNo.toString(),
.approvalNo +
": ",
value: model
.insuranceApprovalInPatient[
indexInsurance]
.approvalNo
.toString(),
), ),
CustomRow( CustomRow(
label: 'Unused Count:', label: 'Unused Count:',
value: model value: model.insuranceApprovalInPatient[indexInsurance].unUsedCount.toString(),
.insuranceApprovalInPatient[
indexInsurance]
.unUsedCount
.toString(),
), ),
CustomRow(label: TranslationBase.of(context).companyName + ": ", value: model.insuranceApprovalInPatient[indexInsurance].companyName.toString()),
CustomRow( CustomRow(
label: TranslationBase.of( label: TranslationBase.of(context).receiptOn + ": ",
context)
.companyName +
": ",
value: 'Sample'),
CustomRow(
label: TranslationBase.of(
context)
.receiptOn +
": ",
value: value:
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].receiptOn ?? ""), isArabic: projectViewModel.isArabic)}'), '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].receiptOn ?? ""), isArabic: projectViewModel.isArabic)}'),
CustomRow( CustomRow(
label: TranslationBase.of( label: TranslationBase.of(context).expiryDate + ": ",
context)
.expiryDate +
": ",
value: value:
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].expiryDate ?? ""), isArabic: projectViewModel.isArabic)}'), '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].expiryDate ?? ""), isArabic: projectViewModel.isArabic)}'),
], ],
@ -243,44 +176,34 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(horizontal: 8.0),
horizontal: 8.0),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context).procedure,
.procedure,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xff2E303A), color: Color(0xff2E303A),
letterSpacing: -0.48, letterSpacing: -0.48,
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.9,
.getTextMultiplierBasedOnWidth() *
2.9,
), ),
), ),
Expanded( Expanded(
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context).status,
.status,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xff2E303A), color: Color(0xff2E303A),
letterSpacing: -0.48, letterSpacing: -0.48,
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.9,
.getTextMultiplierBasedOnWidth() *
2.9,
), ),
), ),
Expanded( Expanded(
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context).usageStatus,
.usageStatus,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xff2E303A), color: Color(0xff2E303A),
letterSpacing: -0.48, letterSpacing: -0.48,
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.9,
.getTextMultiplierBasedOnWidth() *
2.9,
), ),
) )
], ],
@ -290,19 +213,12 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
color: Colors.black, color: Colors.black,
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(horizontal: 8.0),
horizontal: 8.0),
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount: model itemCount: model.insuranceApprovalInPatient[indexInsurance].apporvalDetails!.length,
.insuranceApprovalInPatient[ itemBuilder: (BuildContext context, int index) {
indexInsurance]
.apporvalDetails!
.length,
itemBuilder:
(BuildContext context,
int index) {
return Container( return Container(
child: Column( child: Column(
children: [ children: [
@ -311,81 +227,36 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Expanded( Expanded(
child: Container( child: Container(
child: AppText( child: AppText(
model model.insuranceApprovalInPatient[indexInsurance]?.apporvalDetails![index]?.procedureName ?? "",
.insuranceApprovalInPatient[ textAlign: TextAlign.center,
indexInsurance] fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7,
?.apporvalDetails![ letterSpacing: -0.4,
index] color: Color(0xff575757),
?.procedureName ?? fontWeight: FontWeight.w500,
"",
textAlign:
TextAlign
.center,
fontSize:
SizeConfig
.getTextMultiplierBasedOnWidth() *
2.7,
letterSpacing:
-0.4,
color: Color(
0xff575757),
fontWeight:
FontWeight
.w500,
), ),
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
child: AppText( child: AppText(
model model.insuranceApprovalInPatient[indexInsurance]?.apporvalDetails![index]?.status ?? "",
.insuranceApprovalInPatient[ textAlign: TextAlign.center,
indexInsurance] fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7,
?.apporvalDetails![ letterSpacing: -0.4,
index] color: Color(0xff575757),
?.status ?? fontWeight: FontWeight.w500,
"",
textAlign:
TextAlign
.center,
fontSize:
SizeConfig
.getTextMultiplierBasedOnWidth() *
2.7,
letterSpacing:
-0.4,
color: Color(
0xff575757),
fontWeight:
FontWeight
.w500,
), ),
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
child: AppText( child: AppText(
model model.insuranceApprovalInPatient[indexInsurance]?.apporvalDetails![index]?.isInvoicedDesc ?? "",
.insuranceApprovalInPatient[ textAlign: TextAlign.center,
indexInsurance] fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7,
?.apporvalDetails![ letterSpacing: -0.4,
index] color: Color(0xff575757),
?.isInvoicedDesc ?? fontWeight: FontWeight.w500,
"",
textAlign:
TextAlign
.center,
fontSize:
SizeConfig
.getTextMultiplierBasedOnWidth() *
2.7,
letterSpacing:
-0.4,
color: Color(
0xff575757),
fontWeight:
FontWeight
.w500,
), ),
), ),
), ),
@ -461,24 +332,9 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
model model.insuranceApproval[indexInsurance].approvalStatusDescption != null ? model.insuranceApproval[indexInsurance].approvalStatusDescption ?? "" : "",
.insuranceApproval[ color: model.insuranceApproval[indexInsurance].approvalStatusDescption != null
indexInsurance] ? "${model.insuranceApproval[indexInsurance].approvalStatusDescption}" == "Approved"
.approvalStatusDescption !=
null
? model
.insuranceApproval[
indexInsurance]
.approvalStatusDescption ??
""
: "",
color: model
.insuranceApproval[
indexInsurance]
.approvalStatusDescption !=
null
? "${model.insuranceApproval[indexInsurance].approvalStatusDescption}" ==
"Approved"
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: Color(0xffD02127) : Color(0xffD02127)
: Color(0xffD02127), : Color(0xffD02127),
@ -488,10 +344,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
model model.insuranceApproval[indexInsurance].doctorName!.toUpperCase(),
.insuranceApproval[indexInsurance]
.doctorName!
.toUpperCase(),
color: Colors.black, color: Colors.black,
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -499,8 +352,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
], ],
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(horizontal: 8.0),
horizontal: 8.0),
child: Row( child: Row(
children: [ children: [
Column( Column(
@ -509,37 +361,26 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
height: 85.0, height: 85.0,
width: 85.0, width: 85.0,
child: CircleAvatar( child: CircleAvatar(
radius: SizeConfig radius: SizeConfig.imageSizeMultiplier! * 12,
.imageSizeMultiplier! *
12,
// radius: (52) // radius: (52)
child: ClipRRect( child: ClipRRect(
borderRadius: borderRadius: BorderRadius.circular(50),
BorderRadius.circular(
50),
child: Image.network( child: Image.network(
model model.insuranceApproval[indexInsurance].doctorImage!,
.insuranceApproval[
indexInsurance]
.doctorImage!,
fit: BoxFit.fill, fit: BoxFit.fill,
width: 700, width: 700,
), ),
), ),
backgroundColor: backgroundColor: Colors.transparent,
Colors.transparent,
), ),
), ),
], ],
), ),
Expanded( Expanded(
child: Padding( child: Padding(
padding: padding: const EdgeInsets.symmetric(horizontal: 8.0),
const EdgeInsets.symmetric(
horizontal: 8.0),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
//mainAxisAlignment: MainAxisAlignment.center, //mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
@ -548,19 +389,13 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(context).clinic + ": ",
context)
.clinic +
": ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
Expanded( Expanded(
child: AppText( child: AppText(
model model.insuranceApproval[indexInsurance].clinicName!,
.insuranceApproval[
indexInsurance]
.clinicName!,
fontSize: 14, fontSize: 14,
), ),
) )
@ -569,19 +404,12 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of( TranslationBase.of(context).approvalNo + ": ",
context)
.approvalNo +
": ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
AppText( AppText(
model model.insuranceApproval[indexInsurance].approvalNo.toString(),
.insuranceApproval[
indexInsurance]
.approvalNo
.toString(),
fontSize: 14, fontSize: 14,
) )
], ],
@ -589,19 +417,12 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of( TranslationBase.of(context).unusedCount + ": ",
context)
.unusedCount +
": ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
AppText( AppText(
model model.insuranceApproval[indexInsurance].unUsedCount.toString(),
.insuranceApproval[
indexInsurance]
.unUsedCount
.toString(),
fontSize: 14, fontSize: 14,
) )
], ],
@ -609,10 +430,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of( TranslationBase.of(context).companyName + ": ",
context)
.companyName +
": ",
color: Colors.grey[500], color: Colors.grey[500],
), ),
AppText('Sample') AppText('Sample')
@ -621,18 +439,14 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(context).receiptOn + ": ",
context)
.receiptOn +
": ",
color: Colors.grey[500], color: Colors.grey[500],
), ),
Expanded( Expanded(
child: AppText( child: AppText(
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn!), isArabic: projectViewModel.isArabic)}', '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn!), isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: fontWeight: FontWeight.w600,
FontWeight.w600,
), ),
), ),
], ],
@ -640,22 +454,14 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(context).expiryDate + ": ",
context)
.expiryDate +
": ",
color: Colors.grey[500], color: Colors.grey[500],
), ),
if (model if (model.insuranceApproval[indexInsurance].expiryDate != null)
.insuranceApproval[
indexInsurance]
.expiryDate !=
null)
AppText( AppText(
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate!), isArabic: projectViewModel.isArabic)}', '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate!), isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: fontWeight: FontWeight.w600,
FontWeight.w600,
), ),
], ],
), ),
@ -673,28 +479,24 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(horizontal: 8.0),
horizontal: 8.0),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context).procedure,
.procedure,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Expanded( Expanded(
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context).status,
.status,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Expanded( Expanded(
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context).usageStatus,
.usageStatus,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
) )
@ -705,19 +507,13 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
color: Colors.black, color: Colors.black,
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(horizontal: 8.0),
horizontal: 8.0), child: (model.insuranceApproval[indexInsurance].apporvalDetails != null && model.insuranceApproval[indexInsurance].apporvalDetails!.isNotEmpty)
child: (model.insuranceApproval[indexInsurance].apporvalDetails != null && model.insuranceApproval[indexInsurance].apporvalDetails!.isNotEmpty) ? ListView.builder( ? ListView.builder(
shrinkWrap: true, shrinkWrap: true,
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount: model itemCount: model.insuranceApproval[indexInsurance].apporvalDetails!.length,
.insuranceApproval[ itemBuilder: (BuildContext context, int index) {
indexInsurance]
.apporvalDetails!
.length,
itemBuilder:
(BuildContext context,
int index) {
return Container( return Container(
child: Column( child: Column(
children: [ children: [
@ -726,48 +522,24 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Expanded( Expanded(
child: Container( child: Container(
child: AppText( child: AppText(
model model.insuranceApproval[indexInsurance]?.apporvalDetails![index]?.procedureName ?? "",
.insuranceApproval[ textAlign: TextAlign.start,
indexInsurance]
?.apporvalDetails![
index]
?.procedureName ??
"",
textAlign:
TextAlign
.start,
), ),
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
child: AppText( child: AppText(
model model.insuranceApproval[indexInsurance]?.apporvalDetails![index]?.status ?? "",
.insuranceApproval[ textAlign: TextAlign.center,
indexInsurance]
?.apporvalDetails![
index]
?.status ??
"",
textAlign:
TextAlign
.center,
), ),
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
child: AppText( child: AppText(
model model.insuranceApproval[indexInsurance]?.apporvalDetails![index]?.isInvoicedDesc ?? "",
.insuranceApproval[ textAlign: TextAlign.center,
indexInsurance]
?.apporvalDetails![
index]
?.isInvoicedDesc ??
"",
textAlign:
TextAlign
.center,
), ),
), ),
), ),
@ -782,7 +554,8 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
], ],
), ),
); );
}) : NoData(), })
: NoData(),
), ),
], ],
), ),

2
lib/screens/patients/profile/diagnosis/diagnosis_screen.dart
Unescape Escape View File

@ -34,7 +34,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
{bool isLocalBusy = false}) async { {bool isLocalBusy = false}) async {
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map; final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient']; PatiantInformtion patient = routeArgs['patient'];
String type = await sharedPref.getString(SLECTED_PATIENT_TYPE); String type = await sharedPref.getString(SLECTED_PATIENT_TYPE) == '0' ? "2" : "1";
print(type); print(type);
GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel = GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel =

2
lib/screens/patients/profile/lab_result/labs_home_page.dart
Unescape Escape View File

@ -182,7 +182,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
), ),
), ),
), ),
if (model.patientLabOrdersList.isEmpty && (patient!.patientStatusType != 43 && patient!.patientStatusType !=null)) if (model.patientLabOrdersList.isEmpty && patient!.patientStatusType != 43)
Center( Center(
child: ErrorMessage( child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable, error: TranslationBase.of(context).noDataAvailable,

2
lib/screens/prescription/new_prescriptions_page.dart
Unescape Escape View File

@ -28,7 +28,7 @@ class NewPrescriptionsPage extends StatelessWidget {
return BaseView<PrescriptionViewModel>( return BaseView<PrescriptionViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
await model.getPrescriptionListNew( await model.getPrescriptionListNew(
mrn: patient.patientMRN, appNo: patient.appointmentNo); mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : patient.appointmentNo);
await model.isPrincipalCovered(patient: patient); await model.isPrincipalCovered(patient: patient);
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(

3
lib/widgets/shared/loader/gif_loader_container.dart
Unescape Escape View File

@ -14,8 +14,7 @@ class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProv
controller1 = GifController(vsync: this); controller1 = GifController(vsync: this);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
// controller1.repeat( controller1.repeat(period: Duration(milliseconds: 750), reverse: true);
// min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true);
}); });
super.initState(); super.initState();
} }

6
pubspec.yaml
Unescape Escape View File

@ -80,7 +80,7 @@ dependencies:
#GIF image #GIF image
# flutter_gifimage: ^1.0.1 # flutter_gifimage: ^1.0.1
flutter_gif: ^0.0.4 # flutter_gif: ^0.0.4
gif: ^2.3.0 gif: ^2.3.0
#Autocomplete TextField #Autocomplete TextField
autocomplete_textfield: ^2.0.1 autocomplete_textfield: ^2.0.1
@ -130,8 +130,8 @@ dependencies:
flutter_math_fork: ^0.7.2 flutter_math_fork: ^0.7.2
flutter_zoom_videosdk: ^1.10.11 # flutter_zoom_videosdk: ^1.10.11
dart_jsonwebtoken: ^2.14.0 # dart_jsonwebtoken: ^2.14.0
dependency_overrides: dependency_overrides:

Write Preview
Loading…
Cancel
Save