Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
a3a8079
Fix the issue in retrieving the Casesheet Print Data for Cancer Scree…
vanitha1822 Jul 16, 2025
458af67
fix: add the column for NumberperWeek to store and fetch the data (#94)
vanitha1822 Jul 16, 2025
cd5cffb
Update version in pom.xml to 3.4.0
5Amogh Jul 21, 2025
16c3991
chore: add Lombok @Data to BenClinicalObservations (#97)
vanitha1822 Jul 21, 2025
b66035c
fix: add file path in cancer gynecological examination (#98)
vanitha1822 Jul 25, 2025
d878d4b
Fix the data sync issue (#93)
vanitha1822 Jul 30, 2025
2b7f4c3
fix: add functionality to save the file ID's uploaded from doctor scr…
vanitha1822 Jul 30, 2025
1aadead
story: amm-1668 task - 1754
5Amogh Jul 31, 2025
e50c0e9
Merge pull request #101 from PSMRI/amo-3.4
5Amogh Jul 31, 2025
ea84964
story: amm-1754 updated response including father name and phone no o…
5Amogh Aug 1, 2025
e1d6ece
Save the files uploaded from Doctor Screen (#100)
vanitha1822 Aug 1, 2025
690e358
fix: cherry-pick the commits from develop
vanitha1822 Aug 5, 2025
b384bc5
fix: cherry-pick commits from develop
vanitha1822 Jul 1, 2025
9571a35
Fix the Download Masters issue (#103)
vanitha1822 Aug 5, 2025
3d3ce58
fix: remove the validation (#105)
vanitha1822 Aug 6, 2025
4c85e25
fix: replace the old working code (#106)
vanitha1822 Aug 6, 2025
9c97e6d
Fix the datasync upload issue (#107)
vanitha1822 Aug 8, 2025
43df9cf
Fixing the datasync from local to central (#110)
vanitha1822 Aug 10, 2025
2828fe6
fix: remove the token for server authorization (#111)
vanitha1822 Aug 11, 2025
604bd64
Fix the datasync Demographics Issue (#112)
vanitha1822 Aug 14, 2025
62a5a18
Fix the token issue for Ben-gen id generation (#114)
vanitha1822 Aug 19, 2025
d592f6a
fix: replace authorization for local api call (#116)
vanitha1822 Aug 20, 2025
26bf74c
fix: add logs (#117)
vanitha1822 Aug 20, 2025
9f7fb1c
Fix the BenGen ID Issue (#118)
vanitha1822 Aug 22, 2025
6763367
fix: add logs
vanitha1822 Sep 23, 2025
b56ff46
fix: add logs for checking
vanitha1822 Sep 23, 2025
ed82ff1
fix: update the prepare statement
vanitha1822 Sep 23, 2025
3aafc86
fix: add log
vanitha1822 Sep 23, 2025
20db962
fix: add log
vanitha1822 Sep 23, 2025
53207f5
fix: add logs
vanitha1822 Sep 23, 2025
4c883bf
fix: add Sync Result
vanitha1822 Sep 23, 2025
8de6c10
fix: add logs
vanitha1822 Sep 23, 2025
b303fdf
fix: add syncResults
vanitha1822 Sep 23, 2025
69347fe
fix: add syncResults
vanitha1822 Sep 23, 2025
80d49f1
fix: update processed flag
vanitha1822 Sep 23, 2025
f9f77a6
fix: update the response
vanitha1822 Sep 23, 2025
6338544
fix: update the exception block
vanitha1822 Sep 24, 2025
a0639a8
fix: upload fix
vanitha1822 Sep 24, 2025
261e9a0
fix: address duplication issue
vanitha1822 Sep 24, 2025
2ce5163
fix: datasync issue
vanitha1822 Sep 24, 2025
58cfc27
fix: remove reason and add dataaccess exception
vanitha1822 Sep 24, 2025
cfc6e73
fix: revert the server exception
vanitha1822 Sep 24, 2025
d814b5c
fix: remove unwanted code
vanitha1822 Sep 24, 2025
5fde263
fix: exception message
vanitha1822 Sep 24, 2025
24a9c01
fix: fix the error message
vanitha1822 Sep 24, 2025
bbfc871
fix: Merge with release-3.4.1
vanitha1822 Sep 24, 2025
0f79647
fix: update the version
vanitha1822 Sep 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.iemr.mmu</groupId>
<artifactId>mmu-api</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<packaging>war</packaging>

<name>MMU-API</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import com.google.gson.annotations.Expose;
import lombok.Data;

import lombok.Data;

@Entity
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,25 @@ public List<Map<String, Object>> getDataForGivenSchemaAndTable(String schema, St
return resultSetList;
}

public int updateProcessedFlagInVan(String schemaName, String tableName, StringBuilder vanSerialNos,
String autoIncreamentColumn, String user) throws Exception {
public int updateProcessedFlagInVan(String schemaName, String tableName, List<String> vanSerialNos,
String autoIncreamentColumn, String user, String status, String reason) throws Exception {
jdbcTemplate = getJdbcTemplate();
String query = "";

logger.info("Updating processed flag in table: " + tableName + " for vanSerialNos: " + vanSerialNos);

if (tableName != null && tableName.toLowerCase().equals("i_ben_flow_outreach")) {
query = "UPDATE " + schemaName + "." + tableName
+ " SET created_date = ? , processed = 'P', SyncedDate = ?, Syncedby = ? "
+ "WHERE " + autoIncreamentColumn + " IN (" + vanSerialNos + ")";
+ " SET created_date = ? , processed = ?, SyncedDate = ?, Syncedby = ? , SyncFailureReason = ? "
+ "WHERE " + autoIncreamentColumn + " IN (" + String.join(",", vanSerialNos) + ")";
} else {
query = "UPDATE " + schemaName + "." + tableName
+ " SET CreatedDate = ? , processed = 'P', SyncedDate = ?, Syncedby = ? "
+ "WHERE " + autoIncreamentColumn + " IN (" + vanSerialNos + ")";
+ " SET CreatedDate = ? , processed = ?, SyncedDate = ?, Syncedby = ? , SyncFailureReason = ? "
+ "WHERE " + autoIncreamentColumn + " IN (" + String.join(",", vanSerialNos) + ")";
}

Timestamp syncedDate = new Timestamp(System.currentTimeMillis());
int updatedRows = jdbcTemplate.update(query, syncedDate, syncedDate, user);
int updatedRows = jdbcTemplate.update(query, syncedDate, status, syncedDate, user, reason);
return updatedRows;

}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* AMRIT – Accessible Medical Records via Integrated Technology
* Integrated EHR (Electronic Health Records) Solution
*
* Copyright (C) "Piramal Swasthya Management and Research Institute"
*
* This file is part of AMRIT.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see https://www.gnu.org/licenses/.
*/
package com.iemr.mmu.service.dataSyncActivity;

import lombok.Data;

@Data
public class SyncResult {
private String schemaName;
private String tableName;
private String vanSerialNo;
private String syncedBy;
private boolean success;
private String reason; // Failure reason if any

// Constructor
public SyncResult(String schemaName, String tableName, String vanSerialNo, String syncedBy, boolean success, String reason) {
this.schemaName = schemaName;
this.tableName = tableName;
this.vanSerialNo = vanSerialNo;
this.syncedBy = syncedBy;
this.success = success;
this.reason = reason;
}

// Getters & setters omitted for brevity
}
Loading
Loading