From 340c8312a58ead09c855b821abf86c0c715092a1 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 3 Dec 2025 15:16:58 +0530 Subject: [PATCH 1/4] fix: amm-1963 frequncy is not calculating for single dose frequency --- .../common/transaction/CommonNurseServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java b/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java index e2f47509..aa7eadfd 100644 --- a/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java @@ -2887,17 +2887,17 @@ private int calculateQtyPrescribed(String form, String dose, String frequency, S if (form != null && dose != null && frequency != null && duration != null && durationUnit != null) { double qtyInOneDay = getQtyForOneDay(form, dose, frequency); - if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")|| - frequency.equalsIgnoreCase("Single Dose Before Food") || frequency.equalsIgnoreCase("Single Dose After Food")) { - qtyPrescribed = (int) Math.ceil(qtyInOneDay); - } else { + // if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")|| + // frequency.equalsIgnoreCase("Single Dose Before Food") || frequency.equalsIgnoreCase("Single Dose After Food")) { + // qtyPrescribed = (int) Math.ceil(qtyInOneDay); + // } else { if (durationUnit.equalsIgnoreCase("Day(s)")) qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * qtyInOneDay); else if (durationUnit.equalsIgnoreCase("Week(s)")) qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 7 * qtyInOneDay); else if (durationUnit.equalsIgnoreCase("Month(s)")) qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 30 * qtyInOneDay); - } + // } } return qtyPrescribed; From 7994ac81c0983f261b2c899a65dd52491bcd7430 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 4 Dec 2025 10:54:27 +0530 Subject: [PATCH 2/4] fix: amm-1963 remoed the comments --- .../transaction/CommonNurseServiceImpl.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java b/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java index aa7eadfd..e865bc86 100644 --- a/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java @@ -2887,17 +2887,13 @@ private int calculateQtyPrescribed(String form, String dose, String frequency, S if (form != null && dose != null && frequency != null && duration != null && durationUnit != null) { double qtyInOneDay = getQtyForOneDay(form, dose, frequency); - // if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")|| - // frequency.equalsIgnoreCase("Single Dose Before Food") || frequency.equalsIgnoreCase("Single Dose After Food")) { - // qtyPrescribed = (int) Math.ceil(qtyInOneDay); - // } else { - if (durationUnit.equalsIgnoreCase("Day(s)")) - qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * qtyInOneDay); - else if (durationUnit.equalsIgnoreCase("Week(s)")) - qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 7 * qtyInOneDay); - else if (durationUnit.equalsIgnoreCase("Month(s)")) - qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 30 * qtyInOneDay); - // } + if (durationUnit.equalsIgnoreCase("Day(s)")) + qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * qtyInOneDay); + else if (durationUnit.equalsIgnoreCase("Week(s)")) + qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 7 * qtyInOneDay); + else if (durationUnit.equalsIgnoreCase("Month(s)")) + qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 30 * qtyInOneDay); + } return qtyPrescribed; From fb27280a8e350f45e53506336a2ae453eac24573 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 4 Dec 2025 12:22:24 +0530 Subject: [PATCH 3/4] fix: sonarqubecloud fixs --- .../java/com/iemr/tm/service/anc/ANCServiceImpl.java | 6 +++--- .../benFlowStatus/CommonBenStatusFlowServiceImpl.java | 1 - .../iemr/tm/service/cancerScreening/CSServiceImpl.java | 6 ++++-- .../com/iemr/tm/service/covid19/Covid19ServiceImpl.java | 7 ++++--- .../tm/service/generalOPD/GeneralOPDServiceImpl.java | 6 ++++-- .../com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java | 9 ++++++--- .../ncdscreening/NCDSCreeningDoctorServiceImpl.java | 6 ++++-- .../tm/service/ncdscreening/NCDScreeningServiceImpl.java | 6 +++--- .../java/com/iemr/tm/service/pnc/PNCServiceImpl.java | 6 +++--- .../quickConsultation/QuickConsultationServiceImpl.java | 6 ++++-- 10 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java b/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java index 8f8db36f..59d21520 100644 --- a/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java @@ -348,11 +348,11 @@ public Long saveANCDoctorData(JsonObject requestOBJ, String Authorization) throw Long diagnosisSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - Integer tcRequestStatusFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } if (requestOBJ != null) { diff --git a/src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java b/src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java index d905a7a7..ec0f8514 100644 --- a/src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.Calendar; -import org.checkerframework.checker.units.qual.s; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java b/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java index a9bd3575..cae5a298 100644 --- a/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java @@ -810,10 +810,12 @@ public String getBenDataFrmNurseToDocExaminationScreen(Long benRegID, Long visit public Long saveCancerScreeningDoctorData(JsonObject requestOBJ, String Authorization) throws Exception { Long docDataSuccessFlag = null; Long tcRequestStatusFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; + Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } diff --git a/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java b/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java index db0adb7f..5eb1a547 100644 --- a/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java @@ -967,7 +967,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer prescriptionSuccessFlag = null; // Long diagnosisSuccessFlag = null; Long referSaveSuccessFlag = null; - Integer tcRequestStatusFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; + if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -982,8 +983,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java b/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java index aa09b486..acef711a 100644 --- a/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java @@ -738,6 +738,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; + //Integer tcRequestStatusFlag = null; @@ -755,8 +757,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java b/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java index 2076464d..9fe06080 100644 --- a/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java @@ -756,7 +756,7 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer prescriptionSuccessFlag = null; Long diagnosisSuccessFlag = null; Long referSaveSuccessFlag = null; - Integer tcRequestStatusFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -772,8 +772,11 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + + + + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java b/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java index b21423b7..dfff0b3e 100644 --- a/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java @@ -78,6 +78,8 @@ public int updateDoctorData(JsonObject requestOBJ, String Authorization) throws Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; + if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -95,8 +97,8 @@ public int updateDoctorData(JsonObject requestOBJ, String Authorization) throws Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java b/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java index dc91a21a..db394ef5 100644 --- a/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java @@ -1008,7 +1008,7 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - Integer tcRequestStatusFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -1024,8 +1024,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java b/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java index 7ad63321..1adaa245 100644 --- a/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java @@ -300,7 +300,7 @@ public Long savePNCDoctorData(JsonObject requestOBJ, String Authorization) throw Long diagnosisSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - // Integer tcRequestStatusFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -316,8 +316,8 @@ public Long savePNCDoctorData(JsonObject requestOBJ, String Authorization) throw Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java b/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java index 9ca3e73a..4c70729f 100644 --- a/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java @@ -316,6 +316,8 @@ public Integer quickConsultDoctorDataInsert(JsonObject quickConsultDoctorOBJ, St Integer investigationSuccessFlag = null; Integer vitalsRBSTestFlag=null; Long referSaveSuccessFlag = null; + final String Doctor_Signature = "doctorSignatureFlag"; + TeleconsultationRequestOBJ tcRequestOBJ = null; CommonUtilityClass commonUtilityClass = InputMapper.gson().fromJson(quickConsultDoctorOBJ, @@ -340,8 +342,8 @@ public Integer quickConsultDoctorDataInsert(JsonObject quickConsultDoctorOBJ, St isMedicinePrescribed = true; Boolean doctorSignatureFlag = false; - if (quickConsultDoctorOBJ.has("doctorSignatureFlag") && !quickConsultDoctorOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = quickConsultDoctorOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (quickConsultDoctorOBJ.has(Doctor_Signature) && !quickConsultDoctorOBJ.get(Doctor_Signature).isJsonNull()) { + doctorSignatureFlag = quickConsultDoctorOBJ.get(Doctor_Signature).getAsBoolean(); } // save prescribed medicine From 114cee63dce073177a5142c0d547fb76817218e6 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 4 Dec 2025 13:16:55 +0530 Subject: [PATCH 4/4] fix: added const variable to doctorsignature object to remove duplicate --- src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java | 6 +++--- .../com/iemr/tm/service/cancerScreening/CSServiceImpl.java | 6 +++--- .../com/iemr/tm/service/covid19/Covid19ServiceImpl.java | 7 ++++--- .../iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java | 6 +++--- .../com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java | 6 +++--- .../ncdscreening/NCDSCreeningDoctorServiceImpl.java | 6 +++--- .../tm/service/ncdscreening/NCDScreeningServiceImpl.java | 7 ++++--- src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java | 6 +++--- .../quickConsultation/QuickConsultationServiceImpl.java | 6 +++--- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java b/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java index 59d21520..5f8d1156 100644 --- a/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java @@ -348,11 +348,11 @@ public Long saveANCDoctorData(JsonObject requestOBJ, String Authorization) throw Long diagnosisSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); Boolean doctorSignatureFlag = false; - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } if (requestOBJ != null) { diff --git a/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java b/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java index cae5a298..a13f7499 100644 --- a/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java @@ -810,12 +810,12 @@ public String getBenDataFrmNurseToDocExaminationScreen(Long benRegID, Long visit public Long saveCancerScreeningDoctorData(JsonObject requestOBJ, String Authorization) throws Exception { Long docDataSuccessFlag = null; Long tcRequestStatusFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); Boolean doctorSignatureFlag = false; - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } diff --git a/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java b/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java index 5eb1a547..2d133113 100644 --- a/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java @@ -967,7 +967,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer prescriptionSuccessFlag = null; // Long diagnosisSuccessFlag = null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); + if (requestOBJ != null) { @@ -983,8 +984,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java b/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java index acef711a..7039a632 100644 --- a/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java @@ -738,7 +738,7 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); //Integer tcRequestStatusFlag = null; @@ -757,8 +757,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java b/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java index 9fe06080..b5e42548 100644 --- a/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java @@ -756,7 +756,7 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer prescriptionSuccessFlag = null; Long diagnosisSuccessFlag = null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -775,8 +775,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java b/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java index dfff0b3e..328fcbd6 100644 --- a/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java @@ -78,7 +78,7 @@ public int updateDoctorData(JsonObject requestOBJ, String Authorization) throws Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); if (requestOBJ != null) { @@ -97,8 +97,8 @@ public int updateDoctorData(JsonObject requestOBJ, String Authorization) throws Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java b/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java index db394ef5..486361cb 100644 --- a/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java @@ -1008,7 +1008,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); + if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -1024,8 +1025,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java b/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java index 1adaa245..e7dedec5 100644 --- a/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java @@ -300,7 +300,7 @@ public Long savePNCDoctorData(JsonObject requestOBJ, String Authorization) throw Long diagnosisSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -316,8 +316,8 @@ public Long savePNCDoctorData(JsonObject requestOBJ, String Authorization) throw Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has(Doctor_Signature) && !requestOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = requestOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); } // checking if test is prescribed diff --git a/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java b/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java index 4c70729f..306e30a3 100644 --- a/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java @@ -316,7 +316,7 @@ public Integer quickConsultDoctorDataInsert(JsonObject quickConsultDoctorOBJ, St Integer investigationSuccessFlag = null; Integer vitalsRBSTestFlag=null; Long referSaveSuccessFlag = null; - final String Doctor_Signature = "doctorSignatureFlag"; + boolean doctorSignature = quickConsultDoctorOBJ.has("doctorSignatureFlag"); TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -342,8 +342,8 @@ public Integer quickConsultDoctorDataInsert(JsonObject quickConsultDoctorOBJ, St isMedicinePrescribed = true; Boolean doctorSignatureFlag = false; - if (quickConsultDoctorOBJ.has(Doctor_Signature) && !quickConsultDoctorOBJ.get(Doctor_Signature).isJsonNull()) { - doctorSignatureFlag = quickConsultDoctorOBJ.get(Doctor_Signature).getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } // save prescribed medicine