bug fixes of age multiple entries of OR and progress report.

ipd-changes-for-vida-plus
parent d7581065dc
commit 5f8d44ae40

@ -631,7 +631,10 @@ class PatientService extends BaseService {
response['ListPatientConditionProgress']['resultData'].forEach((v) =>
v['PATIENT_CONDITION'].forEach((item) {
stpMasterList.add(item);
stpMasterList.add({
"ParameterCode": int.tryParse(item['code']),
"Description": item['name'],
});
}));
success = false;
}, onFailure: (String error, int statusCode) {

@ -12,7 +12,7 @@ class PatientMedicalReportService extends BaseService {
Future getMedicalReportList(PatiantInformtion patient, bool isVidaPlusProject) async {
hasError = false;
Map<String, dynamic> body = Map();
await getDoctorProfile();
await getDoctorProfile(isGetProfile: true);
body['AdmissionNo'] = isVidaPlusProject ?patient.admissionID : patient.admissionNo;
body['SetupID'] = doctorProfile!.setupID;
body['ProjectID'] = doctorProfile!.projectID;
@ -92,9 +92,9 @@ class PatientMedicalReportService extends BaseService {
body['AdmissionNo'] = isVidaPlusProject == true? patient.admissionID ?? -1 :int.parse(patient.admissionNo!);
print('the admission no is ${body['AdmissionNo']}');
body['MedicalReportHTML'] = htmlText;
body['ProjectID'] = patient.projectId;
body['ProjectID'] = doctorProfile?.projectID;
body['PatientID'] = patient.patientId;
body['DoctorID'] = patient.doctorId;
body['DoctorID'] = doctorProfile?.doctorID;
if(isVidaPlusProject == true) {
body['PatientType'] = patient.patientType;
}

@ -72,7 +72,7 @@ class PendingOrderService extends BaseService {
hasError = false;
await baseAppClient.post(GET_ADMISSION_ORDERS, onSuccess: (dynamic response, int statusCode) {
print("Success");
//admissionOrderList.clear();
admissionOrderList.clear();
response['List_AdmissionOrders'].forEach(
(v) {
_admissionOrderList.add(AdmissionOrdersModel.fromJson(v));

@ -416,4 +416,14 @@ class PatientViewModel extends BaseViewModel {
setState(ViewState.Idle);
}
}
void getProgressNoteCondition() async {
setState(ViewState.BusyLocal);
await _patientService.getPatientCondition();
if (_patientService.hasError) {
error = _patientService.error;
setState(ViewState.ErrorLocal);
} else
setState(ViewState.Idle);
}
}

@ -92,6 +92,9 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
return BaseView<PatientViewModel>(
onModelReady: (model) {
if(widget.isVidaPlusProject){
model.getProgressNoteCondition();
}else
model.getStpMasterList(isLocalBusy: false);
},
builder: (_, model, w) => AppScaffold(

@ -180,7 +180,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
if (model.reservationList[index].remarks != null)
Row(mainAxisAlignment: MainAxisAlignment.start, children: [
AppText(
TranslationBase.of(context).remarks,
"${TranslationBase.of(context).remarks} :",
fontSize: 10,
),
Expanded(

@ -360,7 +360,7 @@ class AppDateUtils {
if (days < 0) {
final int lastDayOfPreviousMonth = DateTime(now.year, now.month, 0).day;
final int lastDayOfPreviousMonth = DateTime(birthDate.year, birthDate.month+1, 0).day;
days += lastDayOfPreviousMonth;
months--;
}

@ -142,7 +142,8 @@ class Utils {
static Future<bool> checkConnection() async {
List<ConnectivityResult> result = await (Connectivity().checkConnectivity());
return result.contains(ConnectivityResult.wifi)||result.contains(ConnectivityResult.mobile);
return true;
// return result.contains(ConnectivityResult.wifi)||result.contains(ConnectivityResult.mobile);
}
static List<WorkingHours> getWorkingHours(String workingHours) {

Loading…
Cancel
Save