fixes for Pharmacy intervention

ipd-changes-for-vida-plus
haroon amjad 1 month ago
parent 0487d5f09f
commit d3b11b82e4

@ -149,9 +149,9 @@ class BaseAppClient {
printEmojis: true,
),
);
log("URL : $url");
print("URL : $url");
logger.d("URL : $url");
log("Body : ${json.encode(body)}");
print("Body : ${json.encode(body)}");
logger.d("Body : ${json.encode(body)}");
var asd = json.encode(body);
var asd2;

@ -413,7 +413,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 10.9;
const VERSION_ID = 11.0;
const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -36,16 +36,23 @@ class InterventionHistory {
factory InterventionHistory.fromJson(Map<String, dynamic> json) {
print('the remark is ${json['remark']}');
return InterventionHistory(
authizationFormText: json['authizationFormText'] ?? '',
authorizedAction: json['authorizedAction'] ?? '',
commentedBy: json['commentedBy'] ?? '',
commentedByName: json['commentedByName'] ?? '',
interventionDesc: json['interventionDesc'] ?? '',
interventionId: json['interventionId'] ?? '',
remark: json['remark'] ?? '',
authizationFormText: json['authizationFormText']?.toString() ?? '',
authorizedAction: _parseInt(json['authorizedAction']),
commentedBy: _parseInt(json['commentedBy']),
commentedByName: json['commentedByName']?.toString() ?? '',
interventionDesc: json['interventionDesc']?.toString() ?? '',
interventionId: _parseInt(json['interventionId']),
remark: json['remark']?.toString() ?? '',
);
}
static int? _parseInt(dynamic value) {
if (value == null) return null;
if (value is int) return value;
if (value is String) return int.tryParse(value);
return null;
}
Map<String, dynamic> toJson() {
return {
'authizationFormText': authizationFormText,

@ -58,28 +58,36 @@ class Medication {
factory Medication.fromJson(Map<String, dynamic> json) {
return Medication(
admissionNo: json['admissionNo']?? '',
createdBy: json['createdBy']?? '',
doctorComments: json['doctorComments']?? '',
doctorName: json['doctorName']?? '',
dosageDetail: json['dosageDetail']?? '',
itemID: json['itemID']?? '',
lineItemNo: json['lineItemNo']?? '',
medication: json['medication']?? '',
nursingStation: json['nursingStation']?? '',
orderNo: json['orderNo']?? '',
patientID: json['patientID']?? '',
patientName: json['patientName']?? '',
pharmacyRemarks: json['pharmacyRemarks']?? '-',
prescriptionNo: json['prescriptionNo']?? '',
accessLevel: _parseInt(json['accessLevel']),
admissionNo: _parseInt(json['admissionNo']),
createdBy: json['createdBy']?.toString() ?? '',
doctorComments: json['doctorComments']?.toString() ?? '',
doctorName: json['doctorName']?.toString() ?? '',
dosageDetail: json['dosageDetail']?.toString() ?? '',
itemID: _parseInt(json['itemID']),
lineItemNo: _parseInt(json['lineItemNo']),
medication: json['medication']?.toString() ?? '',
nursingStation: json['nursingStation']?.toString() ?? '',
orderNo: _parseInt(json['orderNo']),
patientID: _parseInt(json['patientID']),
patientName: json['patientName']?.toString() ?? '',
pharmacyRemarks: json['pharmacyRemarks']?.toString() ?? '-',
prescriptionNo: _parseInt(json['prescriptionNo']),
startDatetime: json['startDatetime'] != null ? DateTime.parse(json['startDatetime']) : null,
status: json['status']?? '',
statusName: json['statusName']?? '',
accessLevelDescription: json['accessLevelDescription']?? '',
status: _parseInt(json['status']),
statusName: json['statusName']?.toString() ?? '',
accessLevelDescription: json['accessLevelDescription']?.toString() ?? '',
stopDatetime: json['stopDatetime'] != null ? DateTime.parse(json['stopDatetime']) : null,
);
}
static int? _parseInt(dynamic value) {
if (value == null) return null;
if (value is int) return value;
if (value is String) return int.tryParse(value);
return null;
}
Map<String, dynamic> toJson() {
return {
'accessLevel': accessLevel,

@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/core/model/pharmacy-intervention-model/interv
import 'package:doctor_app_flutter/core/model/pharmacy-intervention-model/nursing_station.dart';
import 'package:doctor_app_flutter/core/model/pharmacy-intervention-model/pharmacy_intervention_item.dart';
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/core/service/hospitals/hospitals_service.dart';
import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
import 'package:intl/intl.dart';
@ -22,9 +23,6 @@ class PharmacyInterventionService extends BaseService {
"AdmissionNo": admissionId.isEmpty ?'0': admissionId,
"PatientID": num.parse((patientID.isEmpty)?'0':patientID),
};
print("the date is ${convertToISO8601(fromDate).toString()}");
print("the to Date is ${convertToISO8601(fromDate).toString()}");
if(fromDate.isNotEmpty){
var temp = {
"InterventionFromDate": convertToISO8601(fromDate).toString(),
@ -101,16 +99,18 @@ class PharmacyInterventionService extends BaseService {
}
Future<InterventionHistoryList?> getInfectiousDiseaseHistory({
String admissionNumber = '',
String prescriptionNumber = '',
String orderNumber = '',
String itemID = '',
int admissionNumber = 0,
int prescriptionNumber = 0,
int orderNumber = 0,
int itemID = 0,
dynamic memberID,
}) async {
var request = {
"AdmissionNo": admissionNumber,
"PrescriptionNo": prescriptionNumber,
"OrderNo": orderNumber,
"ItemID": itemID,
"MemberID": memberID,
};
hasError = false;

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/enum/view_state.dart';
import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/core/model/pharmacy-intervention-model/intervention_history.dart';
import 'package:doctor_app_flutter/core/model/pharmacy-intervention-model/nursing_station.dart';
import 'package:doctor_app_flutter/core/model/pharmacy-intervention-model/pharmacy_intervention_item.dart';
@ -612,12 +613,20 @@ class PharmacyInterventionViewModel extends BaseViewModel {
}) async {
currentlySelectedMedication = null;
setState(ViewState.BusyLocal);
InterventionHistoryList? result =
await _service.getInfectiousDiseaseHistory(
admissionNumber: medication?.admissionNo?.toString() ?? '',
prescriptionNumber: medication?.prescriptionNo?.toString() ?? '',
orderNumber: medication?.orderNo?.toString() ?? '',
itemID: medication?.itemID?.toString() ?? '');
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(await sharedPref.getObj(DOCTOR_PROFILE));
InterventionHistoryList? result = await _service.getInfectiousDiseaseHistory(
admissionNumber: medication?.admissionNo ?? 0,
prescriptionNumber: medication?.prescriptionNo ?? 0,
orderNumber: medication?.orderNo ?? 0,
itemID: medication?.itemID ?? 0,
memberID: doctorProfile.doctorID ?? 0
);
// await _service.getInfectiousDiseaseHistory(
// admissionNumber: medication?.admissionNo?.toString() ?? '',
// prescriptionNumber: medication?.prescriptionNo?.toString() ?? '',
// orderNumber: medication?.orderNo?.toString() ?? '',
// itemID: medication?.itemID?.toString() ?? '');
if (_service.hasError) {
error = _service.error;
setState(ViewState.ErrorLocal);

@ -12,8 +12,8 @@ description: A new Flutter project.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.4.37+48
#version: 1.4.33+1
version: 1.4.39+50
#version: 1.4.36+1
environment:

Loading…
Cancel
Save