fix app profile

merge-requests/935/head
Elham Rababh 4 years ago
parent 3d76ae6949
commit a11d9f60fd

@ -107,7 +107,7 @@ class ProcedureService extends BaseService {
}, body: _procedureTempleteDetailsRequestModel.toJson()); }, body: _procedureTempleteDetailsRequestModel.toJson());
} }
Future getProcedure({int? mrn, required int appointmentNo}) async { Future getProcedure({int? mrn}) async {
_getOrderedProcedureRequestModel = GetOrderedProcedureRequestModel( _getOrderedProcedureRequestModel = GetOrderedProcedureRequestModel(
patientMRN: mrn, patientMRN: mrn,
); );

@ -66,7 +66,7 @@ class ProcedureViewModel extends BaseViewModel {
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _procedureService.getProcedure(mrn: mrn, appointmentNo: appointmentNo!); await _procedureService.getProcedure(mrn: mrn);
if (_procedureService.hasError) { if (_procedureService.hasError) {
error = _procedureService.error!; error = _procedureService.error!;
if (patientType == "7") if (patientType == "7")

@ -12,7 +12,7 @@ import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'large_avatar.dart'; import 'large_avatar.dart';
import 'package:flutter_svg/svg.dart';
class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
final PatiantInformtion? patient; final PatiantInformtion? patient;
final PatientProfileAppBarModel? patientProfileAppBarModel; final PatientProfileAppBarModel? patientProfileAppBarModel;
@ -133,11 +133,10 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
child: Container( child: Container(
width: SizeConfig.getTextMultiplierBasedOnWidth() * 20, width: SizeConfig.getTextMultiplierBasedOnWidth() * 20,
height: SizeConfig.getTextMultiplierBasedOnWidth() * 20, height: SizeConfig.getTextMultiplierBasedOnWidth() * 20,
child: Image.asset( child: SvgPicture.asset(
gender == 1 gender == 1?"assets/images/svgs/male avatar.svg":"assets/images/svgs/female avatar.svg",
? 'assets/images/male_avatar.png' width: 30,
: 'assets/images/female_avatar.png', height: 30,
fit: BoxFit.cover,
), ),
), ),
), ),
@ -362,9 +361,11 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
value: patientProfileAppBarModel!.branch ?? '', value: patientProfileAppBarModel!.branch ?? '',
), ),
if (patientProfileAppBarModel!.clinic != null) if (patientProfileAppBarModel!.clinic != null)
HeaderRow( Container(
label: 'Clinic: ', child: HeaderRow(
value: patientProfileAppBarModel!.clinic ?? '', label: 'Clinic: ',
value: patientProfileAppBarModel!.clinic ?? '',
),
), ),
if (patientProfileAppBarModel!.isMedicalFile! && patientProfileAppBarModel!.episode != null) if (patientProfileAppBarModel!.isMedicalFile! && patientProfileAppBarModel!.episode != null)
HeaderRow( HeaderRow(
@ -412,10 +413,10 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
: patientProfileAppBarModel!.patient!.admissionDate != null : patientProfileAppBarModel!.patient!.admissionDate != null
? patientProfileAppBarModel!.isFromLabResult! ? patientProfileAppBarModel!.isFromLabResult!
? 210 ? 210
: 200 : patientProfileAppBarModel!.isMedicalFile!?650:200
: patientProfileAppBarModel!.isDischargedPatient! : patientProfileAppBarModel!.isDischargedPatient!
? 240 ? 240
: 130) : 190)
: patientProfileAppBarModel!.height! : patientProfileAppBarModel!.height!
); );

Loading…
Cancel
Save