merge-requests/546/head
Sultan Khan 5 years ago
parent 608198762d
commit b5503a8411

@ -293,14 +293,13 @@ class PatientService extends BaseService {
);
}
Future updatePatientProgressNote(UpdateNoteReqModel req) async {
hasError = false;
await baseAppClient.post(
UPDATE_PROGRESS_NOTE_FOR_INPATIENT,
onSuccess: (dynamic response, int statusCode) {
print("ok");
print("ok");
},
onFailure: (String error, int statusCode) {
hasError = true;
@ -316,7 +315,7 @@ class PatientService extends BaseService {
await baseAppClient.post(
CREATE_PROGRESS_NOTE_FOR_INPATIENT,
onSuccess: (dynamic response, int statusCode) {
print("ok");
print("ok");
},
onFailure: (String error, int statusCode) {
hasError = true;

@ -499,7 +499,8 @@ class _HomeScreenState extends State<HomeScreen> {
"patientSearchForm":
_patientSearchFormValues,
"selectedType": "1",
"arrivalType": "1"
"arrivalType": "1",
"isInpatient": true
});
},
),
@ -538,7 +539,7 @@ class _HomeScreenState extends State<HomeScreen> {
.pushNamed(PATIENTS, arguments: {
"patientSearchForm":
_patientSearchFormValues,
"selectedType": "7",
"selectedType": "0",
"arrivalType": "1"
});
},

@ -93,7 +93,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
});
Navigator.of(context).pushNamed(PATIENTS, arguments: {
"patientSearchForm": _patientSearchFormValues,
"selectedType": isView == false ? '0' : _selectedType,
"selectedType": _selectedType,
"isSearch": true,
"isView": isView
});

@ -68,7 +68,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
List<String> _locations = []; //['All', 'Today', 'Tomorrow', 'Next Week'];
int _activeLocation = 0;
bool isInpatient = false;
bool _isInit = true;
String patientType;
bool isSearch = false;
@ -274,6 +274,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
if (routeArgs != null && routeArgs.containsKey('activeFilter')) {
_activeLocation = routeArgs['activeFilter'];
}
if (routeArgs != null && routeArgs.containsKey('isInpatient')) {
isInpatient = routeArgs['isInpatient'];
}
if (!projectsProvider.isArabic)
patientTypeTitle = SERVICES_PATIANT_HEADER[int.parse(patientType)];
@ -626,6 +629,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
patientType,
arrivalType:
arrivalType,
isInpatient:
isInpatient,
onTap: () {
Navigator.of(context)
.pushNamed(

@ -17,12 +17,14 @@ class PatientCard extends StatelessWidget {
final Function onTap;
final String patientType;
final String arrivalType;
final bool isInpatient;
const PatientCard(
{Key key,
this.patientInfo,
this.onTap,
this.patientType,
this.arrivalType})
this.arrivalType,
this.isInpatient})
: super(key: key);
@override
Widget build(BuildContext context) {
@ -239,8 +241,7 @@ class PatientCard extends StatelessWidget {
),
),
),
if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyInPatient")
if (isInpatient == true)
Container(
child: RichText(
text: new TextSpan(
@ -375,8 +376,7 @@ class PatientCard extends StatelessWidget {
width: 35,
)),
])
: (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyInPatient")
: (isInpatient == true)
? Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [

Loading…
Cancel
Save