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..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; - Integer tcRequestStatusFlag = null; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } 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..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,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; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); + Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); + if (doctorSignature) { + doctorSignatureFlag = doctorSignature; } 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..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; 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..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,9 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer prescriptionSuccessFlag = null; // Long diagnosisSuccessFlag = null; Long referSaveSuccessFlag = null; - Integer tcRequestStatusFlag = null; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); + + if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -982,8 +984,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 (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 aa09b486..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,6 +738,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; + boolean doctorSignature = requestOBJ.has("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 (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 2076464d..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; - Integer tcRequestStatusFlag = null; + boolean doctorSignature = requestOBJ.has("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 (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 b21423b7..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,6 +78,8 @@ public int updateDoctorData(JsonObject requestOBJ, String Authorization) throws Integer findingSuccessFlag = null; Integer prescriptionSuccessFlag = null; Long referSaveSuccessFlag = null; + boolean doctorSignature = requestOBJ.has("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 (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 dc91a21a..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; - Integer tcRequestStatusFlag = null; + 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("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { - doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").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 7ad63321..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; - // Integer tcRequestStatusFlag = null; + boolean doctorSignature = requestOBJ.has("doctorSignatureFlag"); if (requestOBJ != null) { TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -316,7 +316,7 @@ public Long savePNCDoctorData(JsonObject requestOBJ, String Authorization) throw Boolean isMedicinePrescribed = false; Boolean doctorSignatureFlag = false; - if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) { + if (doctorSignature) { doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean(); } 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..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,6 +316,8 @@ public Integer quickConsultDoctorDataInsert(JsonObject quickConsultDoctorOBJ, St Integer investigationSuccessFlag = null; Integer vitalsRBSTestFlag=null; Long referSaveSuccessFlag = null; + boolean doctorSignature = quickConsultDoctorOBJ.has("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 (doctorSignature) { + doctorSignatureFlag = doctorSignature; } // save prescribed medicine