WD: jira issues of vida rectified

update_flutter_3.24_vida_plus_episode
taha.alam 1 year ago
parent 4de8cb4554
commit e87a0a4dd6

@ -326,7 +326,7 @@ const FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisGetFavo
const ADD_TO_FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisAddFavourite'; const ADD_TO_FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisAddFavourite';
const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/CreateDiagnosis'; const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/ContinuePreviousEpisode';
const SEARCH_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/SearchPhysicalExam'; const SEARCH_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/SearchPhysicalExam';

@ -6,7 +6,7 @@ class CreatePhysicalExamination {
String? pomrid; // paitient String? pomrid; // paitient
int? patientID; // paitint int? patientID; // paitint
bool? isClinicPhysicalExamination; // it will be told bool? isClinicPhysicalExamination; // it will be told
int? physicalExaminationSystemID; // category id dynamic? physicalExaminationSystemID; // category id
String? physicalExaminationDescription; // name of the category String? physicalExaminationDescription; // name of the category
int? specialityID; // id of the specialitiy id int? specialityID; // id of the specialitiy id
dynamic selectedOptions; // it will also be told but it could be sent as null dynamic selectedOptions; // it will also be told but it could be sent as null
@ -59,7 +59,7 @@ extension ConvertCategoryToCreatePhysicalExamination on Category {
CreatePhysicalExamination createPhysicalExaminationFromCategory() => CreatePhysicalExamination createPhysicalExaminationFromCategory() =>
CreatePhysicalExamination() CreatePhysicalExamination()
..physicalExaminationDescription = this.name ..physicalExaminationDescription = this.name
..physicalExaminationSystemID = this.categoryId ..physicalExaminationSystemID = this.id
..physicalExaminationCondition = this.selectedCondition ..physicalExaminationCondition = this.selectedCondition
..remark = this.remarksController.text ..remark = this.remarksController.text
..selected = false ..selected = false

@ -663,10 +663,9 @@ class SOAPService extends LookupService {
"pomrId": patient.pomrId, "pomrId": patient.pomrId,
}; };
hasError = false; hasError = false;
patientChiefComplaintListVidaPlus.clear();
await baseAppClient.post(GET_CHIEF_COMPLAINT_VP, await baseAppClient.post(GET_CHIEF_COMPLAINT_VP,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
patientChiefComplaintListVidaPlus.clear();
response['ListChiefComplaintDetails']['resultData'].forEach((v) { response['ListChiefComplaintDetails']['resultData'].forEach((v) {
patientChiefComplaintListVidaPlus patientChiefComplaintListVidaPlus
.add(GetChiefComplaintVidaPlus.fromJson(v)); .add(GetChiefComplaintVidaPlus.fromJson(v));
@ -1068,40 +1067,25 @@ class SOAPService extends LookupService {
PatiantInformtion patient, PatientPreviousDiagnosis diagnosis) async { PatiantInformtion patient, PatientPreviousDiagnosis diagnosis) async {
Map<String, dynamic>? user = await sharedPref.getObj(LOGGED_IN_USER); Map<String, dynamic>? user = await sharedPref.getObj(LOGGED_IN_USER);
Map<String, dynamic> request = { Map<String, dynamic> request = {
"pomrId": patient.pomrId, "patientProblemRevisionId": diagnosis.patientProblemRevisionId,
"appointmentId": patient.appointmentNo,
"clinicGroupId": patient.clinicGroupId,
"clinicId": patient.clinicId,
"patientId": patient.patientId, "patientId": patient.patientId,
"hospitalId": patient.projectId,
"hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID),
"diagnosisType": diagnosis.diagnosisType,
"condition": diagnosis.condition,
"remarks": diagnosis.remarks,
"icdType": diagnosis.icdType,
// "icdVersion": searchDiagnosis.icdVersion,
"icdSubVersion": diagnosis.icdSubVersion,
"isNew": false,
"specificationId": diagnosis.problemId,
"selectedDisease": diagnosis.selectedDisease,
// "diseasesCode": diagnosis.visitWisePatientDiagnoses?.last.diseasesCode,
// "diseasesId": searchDiagnosis.diseasesId,
"selectedIcdCode": diagnosis.selectedIcdCode,
"selectedCategoryCode": diagnosis.selectedCategoryCode,
"selectedSectionCode": diagnosis.selectedSectionCode,
"selectedChapterCode": diagnosis.selectedChapterCode,
// "selectedNandaCode": diagnosis.selectedNandaCode,
"isResolved": false,
"doctorId": patient.doctorId, "doctorId": patient.doctorId,
"doctorCode": user?['List_MemberInformation'][0]['MemberID'], "pomrId": patient.pomrId,
"ProjectID": patient.projectId, "appointmentId": diagnosis.appointmentId,
// "codeRange": searchDiagnosis.codeRange "createdBy": patient.doctorId,
"hospitalId": patient.projectId,
"hospitalGroupId": diagnosis.hospitalGroupId,
"clinicGroupId": diagnosis.clinicGroupId ?? patient.clinicGroupId,
"clinicId": diagnosis.clinicId,
"isSelected": true,
"ProjectID": patient.projectId
}; };
hasError = false; hasError = false;
var success = false; var success = false;
await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS,
onSuccess: (dynamic response, int statusCode) async { onSuccess: (dynamic response, int statusCode) async {
DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); DrAppToastMsg.showSuccesToast(
response['ContinuePreviousEpisode']['message']);
success = true; success = true;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -123,6 +123,7 @@ class _CurrentDiagnosisState extends State<CurrentDiagnosis> {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of(context) TranslationBase.of(context)
.diagnosisAlreadyResolved); .diagnosisAlreadyResolved);
return;
} }
bool result = await Navigator.push( bool result = await Navigator.push(
@ -151,6 +152,7 @@ class _CurrentDiagnosisState extends State<CurrentDiagnosis> {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of(context) TranslationBase.of(context)
.diagnosisAlreadyResolved); .diagnosisAlreadyResolved);
return;
} }
bool result = await model.resolveDiagnosis( bool result = await model.resolveDiagnosis(
widget.currentDiagnosisItems[index], widget.currentDiagnosisItems[index],

@ -50,7 +50,7 @@ class PreviousDiagnosis extends StatelessWidget {
status: diagnosisItems[index].status ?? '', status: diagnosisItems[index].status ?? '',
condition: diagnosisItems[index].condition ?? '', condition: diagnosisItems[index].condition ?? '',
remarks: diagnosisItems[index].remarks ?? '', remarks: diagnosisItems[index].remarks ?? '',
isPreviousAddedToCurrent:diagnosisItems[index].visitWisePatientDiagnoses == true , isPreviousAddedToCurrent:diagnosisItems[index].visitWiseSelected == true ,
onSoapDetailActionClicked: (action) { onSoapDetailActionClicked: (action) {
switch (action) { switch (action) {
case SoapDetailItemActions.AUDIT: case SoapDetailItemActions.AUDIT:

Loading…
Cancel
Save