From 81b79d9dccc7a3b8d7c5105ded2866c92923b436 Mon Sep 17 00:00:00 2001 From: vishwab1 Date: Fri, 10 Jul 2026 13:42:54 +0530 Subject: [PATCH] Add Nikshay TU/Facility fields to login response for Stop TB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit UserServiceRoleMapping gains nikshayTUID/nikshayFacilityID (nullable). createUserMapping() adds them to the Stop TB service block only — additive, every other service line's response is unchanged. Co-Authored-By: Claude Sonnet 5 --- .../common/controller/users/IEMRAdminController.java | 5 +++++ .../iemr/common/data/users/UserServiceRoleMapping.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index 96425018..158c80a2 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -529,6 +529,11 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service // roles.put(new JSONObject(m_UserServiceRoleMapping.getM_Role().toString())); JSONObject roleObject = new JSONObject(m_UserServiceRoleMapping.getM_Role().toString()); roleObject.put("teleConsultation", m_UserServiceRoleMapping.getTeleConsultation()); + // Stop TB / Nikshay — additive only, other service lines are unaffected + if ("Stop TB".equals(serv)) { + roleObject.put("nikshayTUID", m_UserServiceRoleMapping.getNikshayTUID()); + roleObject.put("nikshayFacilityID", m_UserServiceRoleMapping.getNikshayFacilityID()); + } roles.put(roleObject); } } diff --git a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java index 6c34e9c6..a84b3a06 100644 --- a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java +++ b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java @@ -113,6 +113,15 @@ public class UserServiceRoleMapping @Column(name = "teleConsultation") private String teleConsultation; + // Stop TB / Nikshay location scope — populated only when serviceName = "Stop TB" + @Expose + @Column(name = "NikshayTUID") + private Integer nikshayTUID; + + @Expose + @Column(name = "NikshayFacilityID") + private Integer nikshayFacilityID; + // @Expose // @Column(name = "StatusID")