Merge branch 'fix_bugs_new' into 'development'

Fix in patient screen bug

See merge request Cloud_Solution/doctor_app_flutter!809
merge-requests/810/merge
Mohammad Aljammal 4 years ago
commit e5e7452dad

@ -14,7 +14,11 @@ class BaseService {
List<PatiantInformtion> patientArrivalList = []; List<PatiantInformtion> patientArrivalList = [];
//TODO add the user login model when we need it BaseService(){
doctorProfile = null;
}
//TODO add the user login model when we need it
Future<DoctorProfileModel> getDoctorProfile({bool isGetProfile = false}) async { Future<DoctorProfileModel> getDoctorProfile({bool isGetProfile = false}) async {
if(isGetProfile) if(isGetProfile)
{ {

@ -10,7 +10,7 @@ class PatientInPatientService extends BaseService {
Future getInPatientList( Future getInPatientList(
PatientSearchRequestModel requestModel, bool isMyInpatient) async { PatientSearchRequestModel requestModel, bool isMyInpatient) async {
hasError = false; hasError = false;
await getDoctorProfile(); await getDoctorProfile(isGetProfile: true);
if (isMyInpatient) { if (isMyInpatient) {
requestModel.doctorID = doctorProfile.doctorID; requestModel.doctorID = doctorProfile.doctorID;

@ -71,7 +71,7 @@ class _PatientInPatientScreenState extends State<PatientInPatientScreen>
model.specialClinicalCareMappingList[0].nursingStationID; model.specialClinicalCareMappingList[0].nursingStationID;
requestModel.clinicID = 0; requestModel.clinicID = 0;
} }
model.getInPatientList(requestModel); await model.getInPatientList(requestModel);
}, },
builder: (_, model, w) => builder: (_, model, w) =>
AppScaffold( AppScaffold(

@ -15,7 +15,7 @@ class LabResultHistoryPage extends StatelessWidget {
final PatiantInformtion patient; final PatiantInformtion patient;
LabResultHistoryPage({this.patientLabOrder, this.filterName, this.patient}); LabResultHistoryPage({this.patientLabOrder, this.filterName, this.patient});
// TODO mosa changes
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<LabsViewModel>( return BaseView<LabsViewModel>(

@ -75,8 +75,6 @@ class MedicalReportDetailPage extends StatelessWidget {
), ),
), ),
child: Html( child: Html(
data: medicalReport.reportDataHtml ?? "" data: medicalReport.reportDataHtml ?? ""
), ),
) : Container( ) : Container(

Loading…
Cancel
Save