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")