Skip to content

Revert "Sn/3.6.0" #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snehar-nd merged 1 commit into from
Jan 28, 2026
Merged

Revert "Sn/3.6.0" #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 54 additions & 72 deletions src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,24 +810,25 @@ public Long saveBenANCVitalDetails(JsonObject vitalDetailsOBJ, Long benVisitID,
return vitalSuccessFlag;
}


/**
*
* @param requestOBJ
* @return success or failure flag for visitDetails data saving
*/
*/
public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long benVisitID, Long benVisitCode)
throws Exception {

// Initialize all flags with default success values
Long genExmnSuccessFlag = 1L;
Long headToToeExmnSuccessFlag = 1L;
Long cardiExmnSuccessFlag = 1L;
Long respiratoryExmnSuccessFlag = 1L;
Long centralNrvsExmnSuccessFlag = 1L;
Long muskelstlExmnSuccessFlag = 1L;
Long genitorinaryExmnSuccessFlag = 1L;
Long obstetricExmnSuccessFlag = 1L;
Long exmnSuccessFlag = null;

Long genExmnSuccessFlag = null;
Long headToToeExmnSuccessFlag = null;
// Long gastroIntsExmnSuccessFlag = null;
Long cardiExmnSuccessFlag = null;
Long respiratoryExmnSuccessFlag = null;
Long centralNrvsExmnSuccessFlag = null;
Long muskelstlExmnSuccessFlag = null;
Long genitorinaryExmnSuccessFlag = null;
Long obstetricExmnSuccessFlag = null;

// Save General Examination Details
if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("generalExamination")
Expand All @@ -837,13 +838,11 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != generalExamination) {
generalExamination.setBenVisitID(benVisitID);
generalExamination.setVisitCode(benVisitCode);
Long result = commonNurseServiceImpl.savePhyGeneralExamination(generalExamination);
if (result != null && result > 0) {
genExmnSuccessFlag = result;
} else {
genExmnSuccessFlag = null; // Actual failure
}
genExmnSuccessFlag = commonNurseServiceImpl.savePhyGeneralExamination(generalExamination);
// genExmnSuccessFlag =
// ancNurseServiceImpl.savePhyGeneralExamination(generalExamination);
}

}

// Save Head to toe Examination Details
Expand All @@ -854,14 +853,16 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != headToToeExamination) {
headToToeExamination.setBenVisitID(benVisitID);
headToToeExamination.setVisitCode(benVisitCode);
Long result = commonNurseServiceImpl.savePhyHeadToToeExamination(headToToeExamination);
if (result != null && result > 0) {
headToToeExmnSuccessFlag = result;
} else {
headToToeExmnSuccessFlag = null; // Actual failure
}
headToToeExmnSuccessFlag = commonNurseServiceImpl.savePhyHeadToToeExamination(headToToeExamination);
// headToToeExmnSuccessFlag =
// ancNurseServiceImpl.savePhyHeadToToeExamination(headToToeExamination);
}

}
// Save Gastro Intestinal Examination Details
/**
* Removed from anc. Only applicable for generalOPD. date: 07-02-2018
*/

// Save Cardio Vascular Examination Details
if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("cardioVascularExamination")
Expand All @@ -871,13 +872,11 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != cardiovascularExamination) {
cardiovascularExamination.setBenVisitID(benVisitID);
cardiovascularExamination.setVisitCode(benVisitCode);
Long result = commonNurseServiceImpl
cardiExmnSuccessFlag = commonNurseServiceImpl
.saveSysCardiovascularExamination(cardiovascularExamination);
if (result != null && result > 0) {
cardiExmnSuccessFlag = result;
} else {
cardiExmnSuccessFlag = null; // Actual failure
}
// cardiExmnSuccessFlag =
// ancNurseServiceImpl.saveSysCardiovascularExamination(cardiovascularExamination);

}
}

Expand All @@ -889,13 +888,10 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != sysRespiratoryExamination) {
sysRespiratoryExamination.setBenVisitID(benVisitID);
sysRespiratoryExamination.setVisitCode(benVisitCode);
Long result = commonNurseServiceImpl
respiratoryExmnSuccessFlag = commonNurseServiceImpl
.saveSysRespiratoryExamination(sysRespiratoryExamination);
if (result != null && result > 0) {
respiratoryExmnSuccessFlag = result;
} else {
respiratoryExmnSuccessFlag = null; // Actual failure
}
// respiratoryExmnSuccessFlag = ancNurseServiceImpl
// .saveSysRespiratoryExamination(sysRespiratoryExamination);
}
}

Expand All @@ -907,13 +903,10 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != sysCentralNervousExamination) {
sysCentralNervousExamination.setBenVisitID(benVisitID);
sysCentralNervousExamination.setVisitCode(benVisitCode);
Long result = commonNurseServiceImpl
centralNrvsExmnSuccessFlag = commonNurseServiceImpl
.saveSysCentralNervousExamination(sysCentralNervousExamination);
if (result != null && result > 0) {
centralNrvsExmnSuccessFlag = result;
} else {
centralNrvsExmnSuccessFlag = null; // Actual failure
}
// centralNrvsExmnSuccessFlag = ancNurseServiceImpl
// .saveSysCentralNervousExamination(sysCentralNervousExamination);
}
}

Expand All @@ -926,13 +919,11 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != sysMusculoskeletalSystemExamination) {
sysMusculoskeletalSystemExamination.setBenVisitID(benVisitID);
sysMusculoskeletalSystemExamination.setVisitCode(benVisitCode);
Long result = commonNurseServiceImpl
muskelstlExmnSuccessFlag = commonNurseServiceImpl
.saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination);
if (result != null && result > 0) {
muskelstlExmnSuccessFlag = result;
} else {
muskelstlExmnSuccessFlag = null; // Actual failure
}
// muskelstlExmnSuccessFlag = ancNurseServiceImpl
// .saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination);

}
}

Expand All @@ -945,13 +936,11 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != sysGenitourinarySystemExamination) {
sysGenitourinarySystemExamination.setBenVisitID(benVisitID);
sysGenitourinarySystemExamination.setVisitCode(benVisitCode);
Long result = commonNurseServiceImpl
genitorinaryExmnSuccessFlag = commonNurseServiceImpl
.saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination);
if (result != null && result > 0) {
genitorinaryExmnSuccessFlag = result;
} else {
genitorinaryExmnSuccessFlag = null; // Actual failure
}
// genitorinaryExmnSuccessFlag = ancNurseServiceImpl
// .saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination);

}
}

Expand All @@ -963,33 +952,26 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long
if (null != sysObstetricExamination) {
sysObstetricExamination.setBenVisitID(benVisitID);
sysObstetricExamination.setVisitCode(benVisitCode);
Long result = ancNurseServiceImpl.saveSysObstetricExamination(sysObstetricExamination);
if (result != null && result > 0) {
obstetricExmnSuccessFlag = result;
} else {
obstetricExmnSuccessFlag = null; // Actual failure
}
obstetricExmnSuccessFlag = ancNurseServiceImpl.saveSysObstetricExamination(sysObstetricExamination);

}
}

Long exmnSuccessFlag = null;

if ((genExmnSuccessFlag != null && genExmnSuccessFlag > 0)
&& (headToToeExmnSuccessFlag != null && headToToeExmnSuccessFlag > 0)
&& (cardiExmnSuccessFlag != null && cardiExmnSuccessFlag > 0)
&& (respiratoryExmnSuccessFlag != null && respiratoryExmnSuccessFlag > 0)
&& (centralNrvsExmnSuccessFlag != null && centralNrvsExmnSuccessFlag > 0)
&& (muskelstlExmnSuccessFlag != null && muskelstlExmnSuccessFlag > 0)
&& (genitorinaryExmnSuccessFlag != null && genitorinaryExmnSuccessFlag > 0)
&& (obstetricExmnSuccessFlag != null && obstetricExmnSuccessFlag > 0)) {
if ((null != genExmnSuccessFlag && genExmnSuccessFlag > 0)
&& (null != headToToeExmnSuccessFlag && headToToeExmnSuccessFlag > 0)
// && (null != gastroIntsExmnSuccessFlag &&
// gastroIntsExmnSuccessFlag > 0)
&& (null != cardiExmnSuccessFlag && cardiExmnSuccessFlag > 0)
&& (null != respiratoryExmnSuccessFlag && respiratoryExmnSuccessFlag > 0)
&& (null != centralNrvsExmnSuccessFlag && centralNrvsExmnSuccessFlag > 0)
&& (null != muskelstlExmnSuccessFlag && muskelstlExmnSuccessFlag > 0)
&& (null != genitorinaryExmnSuccessFlag && genitorinaryExmnSuccessFlag > 0)
&& (null != obstetricExmnSuccessFlag && obstetricExmnSuccessFlag > 0)) {
exmnSuccessFlag = genExmnSuccessFlag;
}

return exmnSuccessFlag;
}



// ----------Fetch ANC (Nurse) --------------------------------------

@Override
Expand Down
Loading