diff --git a/pom.xml b/pom.xml index ffe74404..19c056f0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.iemr.common-API common-api - 3.8.2 + 3.8.3 war Common-API 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 158c80a2..96425018 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -529,11 +529,6 @@ 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 a84b3a06..6c34e9c6 100644 --- a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java +++ b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java @@ -113,15 +113,6 @@ 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")