diff --git a/src/main/java/com/iemr/mmu/data/ncdcare/NCDCareDiagnosis.java b/src/main/java/com/iemr/mmu/data/ncdcare/NCDCareDiagnosis.java
index 6a413d97..a4acb7c6 100644
--- a/src/main/java/com/iemr/mmu/data/ncdcare/NCDCareDiagnosis.java
+++ b/src/main/java/com/iemr/mmu/data/ncdcare/NCDCareDiagnosis.java
@@ -39,7 +39,7 @@
 @Table(name = "t_ncddiagnosis")
 public class NCDCareDiagnosis {
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY )
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Expose
 	@Column(name = "ID")
 	private Long ID;
@@ -142,20 +142,18 @@ public class NCDCareDiagnosis {
 	@Transient
 	@Expose
 	private String externalInvestigation;
-	
+
 	@Expose
 	@Transient
 	private ArrayList<SCTDescription> provisionalDiagnosisList;
-	
+
 	@Expose
 	@Transient
 	private String diagnosisProvided;
-	
+
 	@Expose
 	@Transient
 	private String diagnosisProvided_SCTCode;
-	
-	
 
 	public String getDiagnosisProvided() {
 		return diagnosisProvided;
@@ -383,7 +381,7 @@ public void setVanID(Integer vanID) {
 
 	public NCDCareDiagnosis(Long beneficiaryRegID, Long benVisitID, Integer providerServiceMapID, Long prescriptionID,
 			String ncdCareCondition, String ncdComplication, String ncdCareType, Long visitCode,
-			String externalInvestigation, String ncdCareConditionOther) {
+			String externalInvestigation, String ncdCareConditionOther, String createdBy, Timestamp createdDate) {
 		super();
 		this.beneficiaryRegID = beneficiaryRegID;
 		this.benVisitID = benVisitID;
@@ -395,6 +393,8 @@ public NCDCareDiagnosis(Long beneficiaryRegID, Long benVisitID, Integer provider
 		this.visitCode = visitCode;
 		this.externalInvestigation = externalInvestigation;
 		this.ncdScreeningConditionOther = ncdCareConditionOther;
+		this.createdBy = createdBy;
+		this.createdDate = createdDate;
 	}
 
 	public static NCDCareDiagnosis getNCDCareDiagnosisDetails(ArrayList<Object[]> resList) {
@@ -402,7 +402,8 @@ public static NCDCareDiagnosis getNCDCareDiagnosisDetails(ArrayList<Object[]> re
 		if (null != resList && resList.size() > 0) {
 			Object[] obj = resList.get(0);
 			cOBJ = new NCDCareDiagnosis((Long) obj[0], (Long) obj[1], (Integer) obj[2], (Long) obj[3], (String) obj[4],
-					(String) obj[5], (String) obj[6], (Long) obj[7], null, (String) obj[8]);
+					(String) obj[5], (String) obj[6], (Long) obj[7], null, (String) obj[8], (String) obj[9],
+					(Timestamp) obj[10]);
 
 		}
 		return cOBJ;
diff --git a/src/main/java/com/iemr/mmu/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java b/src/main/java/com/iemr/mmu/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java
index 6b78c721..e8c2c52a 100644
--- a/src/main/java/com/iemr/mmu/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java
+++ b/src/main/java/com/iemr/mmu/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java
@@ -37,7 +37,7 @@
 public interface NCDCareDiagnosisRepo extends CrudRepository<NCDCareDiagnosis, Long> {
 
 	@Query(" SELECT beneficiaryRegID, benVisitID, providerServiceMapID, prescriptionID, "
-			+ " ncdScreeningCondition, ncdComplication, ncdCareType, visitCode, ncdScreeningConditionOther "
+			+ " ncdScreeningCondition, ncdComplication, ncdCareType, visitCode, ncdScreeningConditionOther, createdBy, createdDate "
 			+ " from NCDCareDiagnosis ba " + " WHERE ba.beneficiaryRegID = :benRegID"
 			+ " AND ba.visitCode = :visitCode AND ba.deleted = false " + " ORDER BY createdDate desc")
 	public ArrayList<Object[]> getNCDCareDiagnosisDetails(@Param("benRegID") Long benRegID,