Merge pull request #93 from indraniBan/develop

save doctor data-prescription save modified
PSMRI · May 3, 2024 · 315118b · 315118b
2 parents 904a66d + 277cd56
commit 315118b
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java b/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java
@@ -3105,28 +3105,29 @@ public Long saveBenPrescription(PrescriptionDetail prescription) {
 
 		if (prescription != null && prescription.getProvisionalDiagnosisList() != null
 				&& prescription.getProvisionalDiagnosisList().size() > 0) {
-			int pointer = 1;
 			for (SCTDescription obj : prescription.getProvisionalDiagnosisList()) {
 				if (obj.getTerm() != null) {
-					if (pointer == prescription.getProvisionalDiagnosisList().size()) {
+					if (pdTerm.toString().isEmpty()) {
 						pdTerm.append(obj.getTerm());
-						if (obj.getConceptID() != null)
+						if (null != obj.getConceptID()) {
 							pdConceptID.append(obj.getConceptID());
-						else
+						} else {
 							pdConceptID.append("N/A");
+						}
 					} else {
-						pdTerm.append(obj.getTerm()).append("  ||  ");
-						if (obj.getConceptID() != null)
-							pdConceptID.append(obj.getConceptID()).append("  ||  ");
-						else
-							pdConceptID.append("N/A").append("  ||  ");
+						if (obj.getTerm() != null) {
+							pdTerm.append("  ||  ").append(obj.getTerm());
+						}
+						if (obj.getConceptID() != null) {
+							pdConceptID.append("  ||  ").append(obj.getConceptID());
+						} else {
+							pdConceptID.append("  ||  ").append("N/A");
+						}
 					}
 				}
-				pointer++;
 			}
 			prescription.setDiagnosisProvided(pdTerm.toString());
 			prescription.setDiagnosisProvided_SCTCode(pdConceptID.toString());
-			// prescription.setDiagnosisProvided_SCTTerm(pdTerm.toString());
 
 		}