From 3a1d72d333fcd35692cf2c9d011007ccc228289d Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 28 Jan 2026 17:29:22 +0530 Subject: [PATCH 1/4] fix: amm-2147 anc care visit is not saving in the nurse section --- .../iemr/mmu/service/anc/ANCServiceImpl.java | 286 ++++++++++++++---- 1 file changed, 232 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java index a04b2932..3f0cfad0 100644 --- a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java @@ -810,25 +810,24 @@ 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 { - 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; + // 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; // Save General Examination Details if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("generalExamination") @@ -838,11 +837,13 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != generalExamination) { generalExamination.setBenVisitID(benVisitID); generalExamination.setVisitCode(benVisitCode); - genExmnSuccessFlag = commonNurseServiceImpl.savePhyGeneralExamination(generalExamination); - // genExmnSuccessFlag = - // ancNurseServiceImpl.savePhyGeneralExamination(generalExamination); + Long result = commonNurseServiceImpl.savePhyGeneralExamination(generalExamination); + if (result != null && result > 0) { + genExmnSuccessFlag = result; + } else { + genExmnSuccessFlag = null; // Actual failure + } } - } // Save Head to toe Examination Details @@ -853,16 +854,14 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != headToToeExamination) { headToToeExamination.setBenVisitID(benVisitID); headToToeExamination.setVisitCode(benVisitCode); - headToToeExmnSuccessFlag = commonNurseServiceImpl.savePhyHeadToToeExamination(headToToeExamination); - // headToToeExmnSuccessFlag = - // ancNurseServiceImpl.savePhyHeadToToeExamination(headToToeExamination); + Long result = commonNurseServiceImpl.savePhyHeadToToeExamination(headToToeExamination); + if (result != null && result > 0) { + headToToeExmnSuccessFlag = result; + } else { + headToToeExmnSuccessFlag = null; // Actual failure + } } - } - // 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") @@ -872,11 +871,13 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != cardiovascularExamination) { cardiovascularExamination.setBenVisitID(benVisitID); cardiovascularExamination.setVisitCode(benVisitCode); - cardiExmnSuccessFlag = commonNurseServiceImpl + Long result = commonNurseServiceImpl .saveSysCardiovascularExamination(cardiovascularExamination); - // cardiExmnSuccessFlag = - // ancNurseServiceImpl.saveSysCardiovascularExamination(cardiovascularExamination); - + if (result != null && result > 0) { + cardiExmnSuccessFlag = result; + } else { + cardiExmnSuccessFlag = null; // Actual failure + } } } @@ -888,10 +889,13 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != sysRespiratoryExamination) { sysRespiratoryExamination.setBenVisitID(benVisitID); sysRespiratoryExamination.setVisitCode(benVisitCode); - respiratoryExmnSuccessFlag = commonNurseServiceImpl + Long result = commonNurseServiceImpl .saveSysRespiratoryExamination(sysRespiratoryExamination); - // respiratoryExmnSuccessFlag = ancNurseServiceImpl - // .saveSysRespiratoryExamination(sysRespiratoryExamination); + if (result != null && result > 0) { + respiratoryExmnSuccessFlag = result; + } else { + respiratoryExmnSuccessFlag = null; // Actual failure + } } } @@ -903,10 +907,13 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != sysCentralNervousExamination) { sysCentralNervousExamination.setBenVisitID(benVisitID); sysCentralNervousExamination.setVisitCode(benVisitCode); - centralNrvsExmnSuccessFlag = commonNurseServiceImpl + Long result = commonNurseServiceImpl .saveSysCentralNervousExamination(sysCentralNervousExamination); - // centralNrvsExmnSuccessFlag = ancNurseServiceImpl - // .saveSysCentralNervousExamination(sysCentralNervousExamination); + if (result != null && result > 0) { + centralNrvsExmnSuccessFlag = result; + } else { + centralNrvsExmnSuccessFlag = null; // Actual failure + } } } @@ -919,11 +926,13 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != sysMusculoskeletalSystemExamination) { sysMusculoskeletalSystemExamination.setBenVisitID(benVisitID); sysMusculoskeletalSystemExamination.setVisitCode(benVisitCode); - muskelstlExmnSuccessFlag = commonNurseServiceImpl + Long result = commonNurseServiceImpl .saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination); - // muskelstlExmnSuccessFlag = ancNurseServiceImpl - // .saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination); - + if (result != null && result > 0) { + muskelstlExmnSuccessFlag = result; + } else { + muskelstlExmnSuccessFlag = null; // Actual failure + } } } @@ -936,11 +945,13 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != sysGenitourinarySystemExamination) { sysGenitourinarySystemExamination.setBenVisitID(benVisitID); sysGenitourinarySystemExamination.setVisitCode(benVisitCode); - genitorinaryExmnSuccessFlag = commonNurseServiceImpl + Long result = commonNurseServiceImpl .saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination); - // genitorinaryExmnSuccessFlag = ancNurseServiceImpl - // .saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination); - + if (result != null && result > 0) { + genitorinaryExmnSuccessFlag = result; + } else { + genitorinaryExmnSuccessFlag = null; // Actual failure + } } } @@ -952,26 +963,193 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long if (null != sysObstetricExamination) { sysObstetricExamination.setBenVisitID(benVisitID); sysObstetricExamination.setVisitCode(benVisitCode); - obstetricExmnSuccessFlag = ancNurseServiceImpl.saveSysObstetricExamination(sysObstetricExamination); - + Long result = ancNurseServiceImpl.saveSysObstetricExamination(sysObstetricExamination); + if (result != null && result > 0) { + obstetricExmnSuccessFlag = result; + } else { + obstetricExmnSuccessFlag = null; // Actual failure + } } } - 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)) { + 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)) { exmnSuccessFlag = genExmnSuccessFlag; } + return exmnSuccessFlag; } + // /** + // * + // * @param requestOBJ + // * @return success or failure flag for visitDetails data saving + // */ + // public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long benVisitID, Long benVisitCode) + // throws Exception { + + // 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") + // && !examinationDetailsOBJ.get("generalExamination").isJsonNull()) { + // PhyGeneralExamination generalExamination = InputMapper.gson() + // .fromJson(examinationDetailsOBJ.get("generalExamination"), PhyGeneralExamination.class); + // if (null != generalExamination) { + // generalExamination.setBenVisitID(benVisitID); + // generalExamination.setVisitCode(benVisitCode); + // genExmnSuccessFlag = commonNurseServiceImpl.savePhyGeneralExamination(generalExamination); + // // genExmnSuccessFlag = + // // ancNurseServiceImpl.savePhyGeneralExamination(generalExamination); + // } + + // } + + // // Save Head to toe Examination Details + // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("headToToeExamination") + // && !examinationDetailsOBJ.get("headToToeExamination").isJsonNull()) { + // PhyHeadToToeExamination headToToeExamination = InputMapper.gson() + // .fromJson(examinationDetailsOBJ.get("headToToeExamination"), PhyHeadToToeExamination.class); + // if (null != headToToeExamination) { + // headToToeExamination.setBenVisitID(benVisitID); + // headToToeExamination.setVisitCode(benVisitCode); + // 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") + // && !examinationDetailsOBJ.get("cardioVascularExamination").isJsonNull()) { + // SysCardiovascularExamination cardiovascularExamination = InputMapper.gson().fromJson( + // examinationDetailsOBJ.get("cardioVascularExamination"), SysCardiovascularExamination.class); + // if (null != cardiovascularExamination) { + // cardiovascularExamination.setBenVisitID(benVisitID); + // cardiovascularExamination.setVisitCode(benVisitCode); + // cardiExmnSuccessFlag = commonNurseServiceImpl + // .saveSysCardiovascularExamination(cardiovascularExamination); + // // cardiExmnSuccessFlag = + // // ancNurseServiceImpl.saveSysCardiovascularExamination(cardiovascularExamination); + + // } + // } + + // // Save Respiratory Examination Details + // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("respiratorySystemExamination") + // && !examinationDetailsOBJ.get("respiratorySystemExamination").isJsonNull()) { + // SysRespiratoryExamination sysRespiratoryExamination = InputMapper.gson().fromJson( + // examinationDetailsOBJ.get("respiratorySystemExamination"), SysRespiratoryExamination.class); + // if (null != sysRespiratoryExamination) { + // sysRespiratoryExamination.setBenVisitID(benVisitID); + // sysRespiratoryExamination.setVisitCode(benVisitCode); + // respiratoryExmnSuccessFlag = commonNurseServiceImpl + // .saveSysRespiratoryExamination(sysRespiratoryExamination); + // // respiratoryExmnSuccessFlag = ancNurseServiceImpl + // // .saveSysRespiratoryExamination(sysRespiratoryExamination); + // } + // } + + // // Save Central Nervous Examination Details + // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("centralNervousSystemExamination") + // && !examinationDetailsOBJ.get("centralNervousSystemExamination").isJsonNull()) { + // SysCentralNervousExamination sysCentralNervousExamination = InputMapper.gson().fromJson( + // examinationDetailsOBJ.get("centralNervousSystemExamination"), SysCentralNervousExamination.class); + // if (null != sysCentralNervousExamination) { + // sysCentralNervousExamination.setBenVisitID(benVisitID); + // sysCentralNervousExamination.setVisitCode(benVisitCode); + // centralNrvsExmnSuccessFlag = commonNurseServiceImpl + // .saveSysCentralNervousExamination(sysCentralNervousExamination); + // // centralNrvsExmnSuccessFlag = ancNurseServiceImpl + // // .saveSysCentralNervousExamination(sysCentralNervousExamination); + // } + // } + + // // Save Muskeloskeletal Examination Details + // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("musculoskeletalSystemExamination") + // && !examinationDetailsOBJ.get("musculoskeletalSystemExamination").isJsonNull()) { + // SysMusculoskeletalSystemExamination sysMusculoskeletalSystemExamination = InputMapper.gson().fromJson( + // examinationDetailsOBJ.get("musculoskeletalSystemExamination"), + // SysMusculoskeletalSystemExamination.class); + // if (null != sysMusculoskeletalSystemExamination) { + // sysMusculoskeletalSystemExamination.setBenVisitID(benVisitID); + // sysMusculoskeletalSystemExamination.setVisitCode(benVisitCode); + // muskelstlExmnSuccessFlag = commonNurseServiceImpl + // .saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination); + // // muskelstlExmnSuccessFlag = ancNurseServiceImpl + // // .saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination); + + // } + // } + + // // Save Genito Urinary Examination Details + // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("genitoUrinarySystemExamination") + // && !examinationDetailsOBJ.get("genitoUrinarySystemExamination").isJsonNull()) { + // SysGenitourinarySystemExamination sysGenitourinarySystemExamination = InputMapper.gson().fromJson( + // examinationDetailsOBJ.get("genitoUrinarySystemExamination"), + // SysGenitourinarySystemExamination.class); + // if (null != sysGenitourinarySystemExamination) { + // sysGenitourinarySystemExamination.setBenVisitID(benVisitID); + // sysGenitourinarySystemExamination.setVisitCode(benVisitCode); + // genitorinaryExmnSuccessFlag = commonNurseServiceImpl + // .saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination); + // // genitorinaryExmnSuccessFlag = ancNurseServiceImpl + // // .saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination); + + // } + // } + + // // Save Obstetric Examination Details + // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("obstetricExamination") + // && !examinationDetailsOBJ.get("obstetricExamination").isJsonNull()) { + // SysObstetricExamination sysObstetricExamination = InputMapper.gson() + // .fromJson(examinationDetailsOBJ.get("obstetricExamination"), SysObstetricExamination.class); + // if (null != sysObstetricExamination) { + // sysObstetricExamination.setBenVisitID(benVisitID); + // sysObstetricExamination.setVisitCode(benVisitCode); + // obstetricExmnSuccessFlag = ancNurseServiceImpl.saveSysObstetricExamination(sysObstetricExamination); + + // } + // } + + // 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 From 505204dfa6db40239bcfe0a5340b919610cc226a Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 28 Jan 2026 17:43:54 +0530 Subject: [PATCH 2/4] fix: amm-2147 anc care visit is not saving in the nurse section --- .../iemr/mmu/service/anc/ANCServiceImpl.java | 162 +----------------- 1 file changed, 1 insertion(+), 161 deletions(-) diff --git a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java index 3f0cfad0..6c28c746 100644 --- a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java @@ -988,167 +988,7 @@ public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long return exmnSuccessFlag; } - // /** - // * - // * @param requestOBJ - // * @return success or failure flag for visitDetails data saving - // */ - // public Long saveBenANCExaminationDetails(JsonObject examinationDetailsOBJ, Long benVisitID, Long benVisitCode) - // throws Exception { - - // 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") - // && !examinationDetailsOBJ.get("generalExamination").isJsonNull()) { - // PhyGeneralExamination generalExamination = InputMapper.gson() - // .fromJson(examinationDetailsOBJ.get("generalExamination"), PhyGeneralExamination.class); - // if (null != generalExamination) { - // generalExamination.setBenVisitID(benVisitID); - // generalExamination.setVisitCode(benVisitCode); - // genExmnSuccessFlag = commonNurseServiceImpl.savePhyGeneralExamination(generalExamination); - // // genExmnSuccessFlag = - // // ancNurseServiceImpl.savePhyGeneralExamination(generalExamination); - // } - - // } - - // // Save Head to toe Examination Details - // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("headToToeExamination") - // && !examinationDetailsOBJ.get("headToToeExamination").isJsonNull()) { - // PhyHeadToToeExamination headToToeExamination = InputMapper.gson() - // .fromJson(examinationDetailsOBJ.get("headToToeExamination"), PhyHeadToToeExamination.class); - // if (null != headToToeExamination) { - // headToToeExamination.setBenVisitID(benVisitID); - // headToToeExamination.setVisitCode(benVisitCode); - // 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") - // && !examinationDetailsOBJ.get("cardioVascularExamination").isJsonNull()) { - // SysCardiovascularExamination cardiovascularExamination = InputMapper.gson().fromJson( - // examinationDetailsOBJ.get("cardioVascularExamination"), SysCardiovascularExamination.class); - // if (null != cardiovascularExamination) { - // cardiovascularExamination.setBenVisitID(benVisitID); - // cardiovascularExamination.setVisitCode(benVisitCode); - // cardiExmnSuccessFlag = commonNurseServiceImpl - // .saveSysCardiovascularExamination(cardiovascularExamination); - // // cardiExmnSuccessFlag = - // // ancNurseServiceImpl.saveSysCardiovascularExamination(cardiovascularExamination); - - // } - // } - - // // Save Respiratory Examination Details - // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("respiratorySystemExamination") - // && !examinationDetailsOBJ.get("respiratorySystemExamination").isJsonNull()) { - // SysRespiratoryExamination sysRespiratoryExamination = InputMapper.gson().fromJson( - // examinationDetailsOBJ.get("respiratorySystemExamination"), SysRespiratoryExamination.class); - // if (null != sysRespiratoryExamination) { - // sysRespiratoryExamination.setBenVisitID(benVisitID); - // sysRespiratoryExamination.setVisitCode(benVisitCode); - // respiratoryExmnSuccessFlag = commonNurseServiceImpl - // .saveSysRespiratoryExamination(sysRespiratoryExamination); - // // respiratoryExmnSuccessFlag = ancNurseServiceImpl - // // .saveSysRespiratoryExamination(sysRespiratoryExamination); - // } - // } - - // // Save Central Nervous Examination Details - // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("centralNervousSystemExamination") - // && !examinationDetailsOBJ.get("centralNervousSystemExamination").isJsonNull()) { - // SysCentralNervousExamination sysCentralNervousExamination = InputMapper.gson().fromJson( - // examinationDetailsOBJ.get("centralNervousSystemExamination"), SysCentralNervousExamination.class); - // if (null != sysCentralNervousExamination) { - // sysCentralNervousExamination.setBenVisitID(benVisitID); - // sysCentralNervousExamination.setVisitCode(benVisitCode); - // centralNrvsExmnSuccessFlag = commonNurseServiceImpl - // .saveSysCentralNervousExamination(sysCentralNervousExamination); - // // centralNrvsExmnSuccessFlag = ancNurseServiceImpl - // // .saveSysCentralNervousExamination(sysCentralNervousExamination); - // } - // } - - // // Save Muskeloskeletal Examination Details - // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("musculoskeletalSystemExamination") - // && !examinationDetailsOBJ.get("musculoskeletalSystemExamination").isJsonNull()) { - // SysMusculoskeletalSystemExamination sysMusculoskeletalSystemExamination = InputMapper.gson().fromJson( - // examinationDetailsOBJ.get("musculoskeletalSystemExamination"), - // SysMusculoskeletalSystemExamination.class); - // if (null != sysMusculoskeletalSystemExamination) { - // sysMusculoskeletalSystemExamination.setBenVisitID(benVisitID); - // sysMusculoskeletalSystemExamination.setVisitCode(benVisitCode); - // muskelstlExmnSuccessFlag = commonNurseServiceImpl - // .saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination); - // // muskelstlExmnSuccessFlag = ancNurseServiceImpl - // // .saveSysMusculoskeletalSystemExamination(sysMusculoskeletalSystemExamination); - - // } - // } - - // // Save Genito Urinary Examination Details - // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("genitoUrinarySystemExamination") - // && !examinationDetailsOBJ.get("genitoUrinarySystemExamination").isJsonNull()) { - // SysGenitourinarySystemExamination sysGenitourinarySystemExamination = InputMapper.gson().fromJson( - // examinationDetailsOBJ.get("genitoUrinarySystemExamination"), - // SysGenitourinarySystemExamination.class); - // if (null != sysGenitourinarySystemExamination) { - // sysGenitourinarySystemExamination.setBenVisitID(benVisitID); - // sysGenitourinarySystemExamination.setVisitCode(benVisitCode); - // genitorinaryExmnSuccessFlag = commonNurseServiceImpl - // .saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination); - // // genitorinaryExmnSuccessFlag = ancNurseServiceImpl - // // .saveSysGenitourinarySystemExamination(sysGenitourinarySystemExamination); - - // } - // } - - // // Save Obstetric Examination Details - // if (examinationDetailsOBJ != null && examinationDetailsOBJ.has("obstetricExamination") - // && !examinationDetailsOBJ.get("obstetricExamination").isJsonNull()) { - // SysObstetricExamination sysObstetricExamination = InputMapper.gson() - // .fromJson(examinationDetailsOBJ.get("obstetricExamination"), SysObstetricExamination.class); - // if (null != sysObstetricExamination) { - // sysObstetricExamination.setBenVisitID(benVisitID); - // sysObstetricExamination.setVisitCode(benVisitCode); - // obstetricExmnSuccessFlag = ancNurseServiceImpl.saveSysObstetricExamination(sysObstetricExamination); - - // } - // } - - // 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) -------------------------------------- From 881f2591003d5956c5c66e36d05bed740f807bc2 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Wed, 28 Jan 2026 22:03:46 +0530 Subject: [PATCH 3/4] Revert "Sn/3.6.0" --- .../iemr/mmu/service/anc/ANCServiceImpl.java | 126 ++++++++---------- 1 file changed, 54 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java index 6c28c746..a04b2932 100644 --- a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java @@ -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") @@ -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 @@ -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") @@ -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); + } } @@ -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); } } @@ -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); } } @@ -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); + } } @@ -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); + } } @@ -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 From e564e2730405c5ad65debb80878526004b6ebfb5 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 28 Jan 2026 22:19:38 +0530 Subject: [PATCH 4/4] fix: amm-2147 anc care visit is not saving in the nurse section --- src/main/java/com/iemr/mmu/data/anc/ANCCareDetails.java | 1 + src/main/java/com/iemr/mmu/data/anc/ANCWomenVaccineDetail.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/iemr/mmu/data/anc/ANCCareDetails.java b/src/main/java/com/iemr/mmu/data/anc/ANCCareDetails.java index 36ba14ed..6733d848 100644 --- a/src/main/java/com/iemr/mmu/data/anc/ANCCareDetails.java +++ b/src/main/java/com/iemr/mmu/data/anc/ANCCareDetails.java @@ -185,6 +185,7 @@ public class ANCCareDetails { public ANCCareDetails() { super(); + this.processed = "N"; // TODO Auto-generated constructor stub } diff --git a/src/main/java/com/iemr/mmu/data/anc/ANCWomenVaccineDetail.java b/src/main/java/com/iemr/mmu/data/anc/ANCWomenVaccineDetail.java index c20e7f89..4bfefa01 100644 --- a/src/main/java/com/iemr/mmu/data/anc/ANCWomenVaccineDetail.java +++ b/src/main/java/com/iemr/mmu/data/anc/ANCWomenVaccineDetail.java @@ -130,6 +130,7 @@ public class ANCWomenVaccineDetail { public ANCWomenVaccineDetail() { super(); + this.processed = "N"; // TODO Auto-generated constructor stub }