Skip to content

OTC-780: update business logic #160

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
delcroip merged 3 commits into from
Feb 16, 2023
Merged

OTC-780: update business logic #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd55892
OTC-780: update business logic: items/serives left is now being calcu…
Feb 15, 2023
8acc265
OTC-780: refactor the code
Feb 15, 2023
b555ff8
Update openmis-module-test.yml
Feb 15, 2023
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 .github/workflows/openmis-module-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
run_test:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
services:
mssql:
image: mcr.microsoft.com/mssql/server:2017-latest
Expand Down
4 changes: 2 additions & 2 deletions sql/stored_procedures/uspServiceItemEnquiry.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ BEGIN
INSERT INTO @tblService
SELECT IP.EffectiveDate, PL.ProdID,
DATEADD(MONTH,CASE WHEN @Age >= 18 THEN PS.WaitingPeriodAdult ELSE PS.WaitingPeriodChild END,IP.EffectiveDate) MinDate,
(CASE WHEN @Age >= 18 THEN NULLIF(PS.LimitNoAdult,0) ELSE NULLIF(PS.LimitNoChild,0) END) - COUNT(CS.ServiceID) ServicesLeft
(CASE WHEN @Age >= 18 THEN NULLIF(PS.LimitNoAdult,0) ELSE NULLIF(PS.LimitNoChild,0) END) - SUM(COALESCE(CS.QtyApproved, CS.QtyProvided)) ServicesLeft
FROM tblInsureePolicy IP INNER JOIN tblPolicy PL ON IP.PolicyId = PL.PolicyID
INNER JOIN tblProductServices PS ON PL.ProdID = PS.ProdID
LEFT OUTER JOIN tblClaim C ON IP.InsureeId = C.InsureeID
Expand Down Expand Up @@ -78,7 +78,7 @@ BEGIN
INSERT INTO @tblItem
SELECT IP.EffectiveDate, PL.ProdID,
DATEADD(MONTH,CASE WHEN @Age >= 18 THEN PItem.WaitingPeriodAdult ELSE PItem.WaitingPeriodChild END,IP.EffectiveDate) MinDate,
(CASE WHEN @Age >= 18 THEN NULLIF(PItem.LimitNoAdult,0) ELSE NULLIF(PItem.LimitNoChild,0) END) - COUNT(CI.ItemID) ItemsLeft
(CASE WHEN @Age >= 18 THEN NULLIF(PItem.LimitNoAdult,0) ELSE NULLIF(PItem.LimitNoChild,0) END) - SUM(COALESCE(CI.QtyApproved, CI.QtyProvided)) ItemsLeft
FROM tblInsureePolicy IP INNER JOIN tblPolicy PL ON IP.PolicyId = PL.PolicyID
INNER JOIN tblProductItems PItem ON PL.ProdID = PItem.ProdID
LEFT OUTER JOIN tblClaim C ON IP.InsureeId = C.InsureeID
Expand Down