diff --git a/src/main/java/in/gov/secureapi/service/DBFOT_service.java b/src/main/java/in/gov/secureapi/service/DBFOT_service.java
index 5c459b6..7029061 100644
--- a/src/main/java/in/gov/secureapi/service/DBFOT_service.java
+++ b/src/main/java/in/gov/secureapi/service/DBFOT_service.java
@@ -194,9 +194,13 @@ public class DBFOT_service {
 		                return ps;
 		            }, keyHolder);
 		            
-		            if (affectedRows > 0) {
+		            if (affectedRows > 0 && keyHolder.getKey() != null) {
+		            	
+		            	int savedId = keyHolder.getKey().intValue();
+		            	
 		    	        response.put("status", "Success");
 			            response.put("message", "Complaints Saved Successfully");
+			            response.put("id", savedId);
 		    	    } else {
 		    	        response.put("status", "Failed");
 		    	        response.put("message", "Error while saving complaints");
@@ -233,9 +237,7 @@ public class DBFOT_service {
 			
 			Map<String, Object> response = new HashMap<>();
 			
-			if(remarks.isEmpty()) {
-				remarks=null;
-			}
+			String remarksVal = (remarks != null && !remarks.isEmpty())? remarks : null;
 			
 			try {
 				
@@ -265,13 +267,10 @@ public class DBFOT_service {
 		        
 		        Map<String, Object> complaint = complaintList.get(0);
 		        
-		        String imgFileValue = null;
-
-		        if (imgfile != null && !imgfile.isEmpty()) {
-
-		            
-		            imgFileValue = fileUpload(imgfile, "dbfot_toilet_img");
-		        }
+		        String imgFileValue =
+		                (imgfile != null && !imgfile.isEmpty())
+		                        ? fileUpload(imgfile, "dbfot_toilet_img")
+		                        : null;
 		        
 		        String historySql =
 		                "INSERT INTO complaints_history " +
@@ -279,19 +278,21 @@ public class DBFOT_service {
 		                "complaint_updated_on, complaint_updated_by, remarks, imgfile, cby) " +
 		                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
-
-		        int historyAffectedRows = jdbcTemplate.update(
-		                historySql,
-		                complaint_id,
-		                status,
-		                complaint_raised_on,
-		                complaint_raised_by,
-		                complaint_updated_on,
-		                complaint_updated_by,
-		                remarks,
-		                imgFileValue,
-		                cby
-		        );
+		        KeyHolder keyHolder = new GeneratedKeyHolder();
+		        int historyAffectedRows = jdbcTemplate.update(connection -> {
+	                PreparedStatement ps = connection.prepareStatement(historySql, Statement.RETURN_GENERATED_KEYS);
+	                ps.setString(1,complaint_id);
+	                ps.setString(2,status);
+	                ps.setString(3,complaint_raised_on);
+	                ps.setString(4,complaint_raised_by);
+	                ps.setString(5,complaint_updated_on);
+	                ps.setString(6,complaint_updated_by);
+	                ps.setString(7,remarksVal);
+	                ps.setString(8,imgFileValue);
+	                ps.setString(9, cby);
+		            return ps;
+	            }, keyHolder);
+	            
 		        
 		        if (historyAffectedRows <= 0) {
 
@@ -340,17 +341,14 @@ public class DBFOT_service {
 		                    "AND isdelete = 0";
 
 
-		            int updateAffectedRows = jdbcTemplate.update(
-		                    updateSql,
-		                    status,
-		                    complaint_id
-		            );
+					int updateAffectedRows = jdbcTemplate.update(updateSql, status, complaint_id);
 		            
-		            if (updateAffectedRows > 0) {
+		            if (updateAffectedRows > 0  && keyHolder.getKey() != null) {
+		            	int savedId = keyHolder.getKey().intValue();
 
 		                response.put("status", "Success");
-		                response.put("message",
-		                        "Complaint history saved and complaint status updated successfully");
+		                response.put("message","Complaint history saved and complaint status updated successfully");
+		                response.put("id", savedId);
 
 		            } else {
 
@@ -419,9 +417,12 @@ public class DBFOT_service {
 			                return ps;
 			            }, keyHolder);
 			            
-			            if (affectedRows > 0) {
+			            if (affectedRows > 0  && keyHolder.getKey() != null) {
+			            	int savedId = keyHolder.getKey().intValue();
+			            	
 			    	        response.put("status", "Success");
 				            response.put("message", "Manpower details Saved Successfully");
+				            response.put("id", savedId);
 			    	    } else {
 			    	        response.put("status", "Failed");
 			    	        response.put("message", "Error while saving man power details");
@@ -582,9 +583,12 @@ public class DBFOT_service {
 		                return ps;
 		            }, keyHolder);
 		            
-		            if (affectedRows > 0) {
+		            if (affectedRows > 0 && keyHolder.getKey() != null) {
+		            	int savedId = keyHolder.getKey().intValue();
+		            	
 		    	        response.put("status", "Success");
 			            response.put("message","PCT Master Saved Successfully");
+			            response.put("id", savedId);
 		    	    } else {
 		    	        response.put("status", "Failed");
 		    	        response.put("message", "Error while saving pct master");
@@ -671,11 +675,7 @@ public class DBFOT_service {
 		                    "AND isdelete = 0";
 
 
-		            int updateAffectedRows = jdbcTemplate.update(
-		                    updateSql,
-		                    status,
-		                    pct
-		            );
+					int updateAffectedRows = jdbcTemplate.update(updateSql, status, pct);
 		            
 		            if (updateAffectedRows > 0) {