Skip to content

Add "Strength" field in Short Expiry report #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vanitha1822 merged 9 commits into from
Oct 29, 2025
+3 −11
Merged

Add "Strength" field in Short Expiry report #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cab72c3
Update version in pom.xml to 3.4.0
5Amogh Jul 21, 2025
4bdeb9a
Update pom.xml
5Amogh Jul 21, 2025
f4b84ea
fix: removed db iemr (#97)
vishwab1 Aug 10, 2025
6dc85b5
Merge remote-tracking branch 'origin/main' into release-3.4.0-temp
vishwab1 Aug 14, 2025
8d46e6c
Merge pull request #99 from PSMRI/release-3.4.0-temp
drtechie Aug 18, 2025
2dbe8f2
fix: add logs (#100)
vanitha1822 Aug 20, 2025
5235b38
fix: add strength in shortexpiry report
vanitha1822 Oct 23, 2025
a5a8b88
fix: update pom.xml
vanitha1822 Oct 29, 2025
1d6c554
Merge branch 'release-3.5.0' into nd/vs/add_strength
vanitha1822 Oct 29, 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.iemr.inventory</groupId>
<artifactId>inventory-api</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
<packaging>war</packaging>
<name>Inventory-API</name>
<description>Inventory Page</description>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/inventory/repo/report/ItemStockReportRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ List<Object[]> getDailyStockDetailReportByFacilityID(@Param("startDate") Date st
List<Object[]> getDailyStockSummaryReportByFacilityID(@Param("startDate") Date startDate,
@Param("endDate") Date endDate, @Param("facilityID") Integer facilityID);

@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, Strength, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
+ "where ExpiryDate >= :startDate and ExpiryDate <= adddate(:startDate,AlertBeforeDays) and Deleted=false order by ExpiryDate asc",nativeQuery=true)
List<Object[]> getShortExpiryReport(@Param("startDate") Date startDate);

@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, Strength, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
+ "where ExpiryDate >= :startDate and ExpiryDate <= adddate(:startDate,AlertBeforeDays) and FacilityID = :facilityID and Deleted=false order by ExpiryDate asc",nativeQuery=true)
List<Object[]> getShortExpiryReportByFacilityID(@Param("startDate") Date startDate,
@Param("facilityID") Integer facilityID);
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,6 @@ public List<AllocateItemMap> getItemStockFromItemID(Integer facilityID, List<Ite

ItemMaster item = itemService.getItemMasterCatByID(itemStockExit.getItemID());


System.out.println("Test Item: " + item.toString());
System.out.println("Test item category: "+ item.getItemCategory());
System.out.println("Test item issuetype: "+ item.getItemCategory().getIssueType());
System.out.println("Test facilityID: "+ item.getFacilityID());
System.out.println("Test itemStockExit: "+ itemStockExit.toString());
System.out.println("Test itemStockExit.getDuration(): "+ itemStockExit.getDuration());


allocateItemMap.setFacilityID(item.getFacilityID());
allocateItemMap.setItemID(item.getItemID());
Expand Down
Loading