From df3f76d90b20086f3a4f6228e6bf40f3e62efef9 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Fri, 5 Dec 2025 14:34:49 +0530 Subject: [PATCH 1/2] fix: deployment issue fix --- src/main/java/com/iemr/common/data/users/User.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/iemr/common/data/users/User.java b/src/main/java/com/iemr/common/data/users/User.java index e6184e60..7f284b11 100644 --- a/src/main/java/com/iemr/common/data/users/User.java +++ b/src/main/java/com/iemr/common/data/users/User.java @@ -55,6 +55,7 @@ @Entity @Table(name = "m_user") @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class User implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From deb6a33d1e94ac21289eb97bbe4abbfa37a061f9 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Mon, 8 Dec 2025 14:10:26 +0530 Subject: [PATCH 2/2] feat: amm-1959 dhis token for cho report re-direction --- .../common/controller/users/IEMRAdminController.java | 1 + src/main/java/com/iemr/common/data/users/User.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 55e2f93f..8bc0e74d 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -392,6 +392,7 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service resMap.put("agentPassword", mUser.getAgentPassword()); resMap.put("m_UserLangMappings", new JSONArray(mUser.getM_UserLangMappings().toString())); resMap.put("designationID", mUser.getDesignationID()); + resMap.put("dhistoken",mUser.getDhistoken()); if (mUser.getDesignation() != null) { resMap.put("designation", new JSONObject(mUser.getDesignation().toString())); } diff --git a/src/main/java/com/iemr/common/data/users/User.java b/src/main/java/com/iemr/common/data/users/User.java index 7f284b11..275b0ec6 100644 --- a/src/main/java/com/iemr/common/data/users/User.java +++ b/src/main/java/com/iemr/common/data/users/User.java @@ -209,6 +209,10 @@ public class User implements Serializable { @Column(name = "failed_attempt") private Integer failedAttempt; + @Expose + @Column(name = "dhistoken") + private String dhistoken; + /* * protected User() { } */ @@ -218,7 +222,7 @@ public static User initializeUsers(Long userID, Integer titleID, String firstNam Timestamp dOJ, Integer qualificationID, String userName, String password, String emailID, Status m_Status, List m_UserServiceRoleMapping, String emergencyContactPerson, String emergencyContactNo, Boolean isSupervisor, Boolean deleted, String createdBy, Timestamp createdDate, - String modifiedBy, Timestamp lastModDate, String newPassword) { + String modifiedBy, Timestamp lastModDate, String newPassword, String dhistoken) { User user = new User(); user.userID = userID; user.titleID = titleID; @@ -245,6 +249,7 @@ public static User initializeUsers(Long userID, Integer titleID, String firstNam user.modifiedBy = modifiedBy; user.lastModDate = lastModDate; user.newPassword = newPassword; + user.dhistoken = dhistoken; return user; } @@ -531,6 +536,9 @@ public Integer getDesignationID() { public Designation getDesignation() { return designation; } + public String getDhistoken() { + return dhistoken; + } /* * public User(String userName, String password) { this.userName = userName;