Skip to content

Commit 545fa22

Browse files
dragos-dobredragos-dobre
authored
Finish feature/OTC-67
fix claimoverview and claimhistory
2 parents 3268637 + 0d7f24d commit 545fa22

2 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎Empty databases/openIMIS_ONLINE.sql‎

140 Bytes
Binary file not shown.

‎Migration script/openIMIS migration v1.4.2 - 1.5.0.sql‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3703,26 +3703,26 @@ Go
37033703
COALESCE(TFI.Approved + TFS.Approved, TFI.Approved, TFS.Approved) Approved,
37043704
COALESCE(TFI.Adjusted + TFS.Adjusted, TFI.Adjusted, TFS.Adjusted) Adjusted,
37053705
COALESCE(TFI.Remunerated + TFS.Remunerated, TFI.Remunerated, TFS.Remunerated)Paid,
3706-
CASE WHEN @Scope > 0 AND CI.RejectionReason <> 0 THEN I.ItemCode ELSE NULL END RejectedItem, CI.RejectionReason ItemRejectionCode,
3707-
CASE WHEN @Scope > 0 AND CS.RejectionReason <> 0 THEN S.ServCode ELSE NULL END RejectedService, CS.RejectionReason ServiceRejectionCode,
3708-
CASE WHEN @Scope > 0 AND CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN I.ItemCode ELSE NULL END AdjustedItem,
3709-
CASE WHEN @Scope > 0 AND CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN CI.QtyProvided ELSE NULL END OrgQtyItem,
3710-
CASE WHEN @Scope > 0 AND CI.QtyProvided <> COALESCE(CI.QtyApproved ,CI.QtyProvided) THEN CI.QtyApproved ELSE NULL END AdjQtyItem,
3711-
CASE WHEN @Scope > 0 AND CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN S.ServCode ELSE NULL END AdjustedService,
3712-
CASE WHEN @Scope > 0 AND CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN CS.QtyProvided ELSE NULL END OrgQtyService,
3713-
CASE WHEN @Scope > 0 AND CS.QtyProvided <> COALESCE(CS.QtyApproved ,CS.QtyProvided) THEN CS.QtyApproved ELSE NULL END AdjQtyService,
3706+
CASE WHEN @Scope =2 OR CI.RejectionReason <> 0 THEN I.ItemCode ELSE NULL END RejectedItem, CI.RejectionReason ItemRejectionCode,
3707+
CASE WHEN @Scope =2 OR CS.RejectionReason <> 0 THEN S.ServCode ELSE NULL END RejectedService, CS.RejectionReason ServiceRejectionCode,
3708+
CASE WHEN @Scope =2 OR CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN I.ItemCode ELSE NULL END AdjustedItem,
3709+
CASE WHEN @Scope =2 OR CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN ISNULL(CI.QtyProvided,0) ELSE NULL END OrgQtyItem,
3710+
CASE WHEN @Scope =2 OR CI.QtyProvided <> COALESCE(CI.QtyApproved ,CI.QtyProvided) THEN ISNULL(CI.QtyApproved,0) ELSE NULL END AdjQtyItem,
3711+
CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN S.ServCode ELSE NULL END AdjustedService,
3712+
CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN ISNULL(CS.QtyProvided,0) ELSE NULL END OrgQtyService,
3713+
CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved ,CS.QtyProvided) THEN ISNULL(CS.QtyApproved,0) ELSE NULL END AdjQtyService,
37143714
C.Explanation,
37153715
-- ALL claims
3716-
CASE WHEN @Scope = 2 THEN CS.QtyApproved ELSE NULL END ServiceQtyApproved,
3717-
CASE WHEN @Scope = 2 THEN CI.QtyApproved ELSE NULL END ItemQtyApproved,
3718-
CASE WHEN @Scope = 2 THEN cs.PriceAsked ELSE NULL END ServicePrice,
3719-
CASE WHEN @Scope = 2 THEN CI.PriceAsked ELSE NULL END ItemPrice,
3720-
CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceApproved,0) ELSE NULL END ServicePriceApproved,
3721-
CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceApproved,0) ELSE NULL END ItemPriceApproved,
3722-
CASE WHEN @Scope = 2 THEN ISNULL(cs.Justification,NULL) ELSE NULL END ServiceJustification,
3723-
CASE WHEN @Scope = 2 THEN ISNULL(CI.Justification,NULL) ELSE NULL END ItemJustification,
3724-
CASE WHEN @Scope = 2 THEN cs.ClaimServiceID ELSE NULL END ClaimServiceID,
3725-
CASE WHEN @Scope = 2 THEN CI.ClaimItemID ELSE NULL END ClaimItemID,
3716+
CASE WHEN @Scope = 2 THEN CS.QtyApproved ELSE NULL END ServiceQtyApproved,
3717+
CASE WHEN @Scope = 2 THEN CI.QtyApproved ELSE NULL END ItemQtyApproved,
3718+
CASE WHEN @Scope = 2 THEN cs.PriceAsked ELSE NULL END ServicePrice,
3719+
CASE WHEN @Scope = 2 THEN CI.PriceAsked ELSE NULL END ItemPrice,
3720+
CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceApproved,0) ELSE NULL END ServicePriceApproved,
3721+
CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceApproved,0) ELSE NULL END ItemPriceApproved,
3722+
CASE WHEN @Scope = 2 THEN ISNULL(cs.Justification,NULL) ELSE NULL END ServiceJustification,
3723+
CASE WHEN @Scope = 2 THEN ISNULL(CI.Justification,NULL) ELSE NULL END ItemJustification,
3724+
CASE WHEN @Scope = 2 THEN cs.ClaimServiceID ELSE NULL END ClaimServiceID,
3725+
CASE WHEN @Scope = 2 THEN CI.ClaimItemID ELSE NULL END ClaimItemID,
37263726
--,cs.PriceApproved ServicePriceApproved,ci.PriceApproved ItemPriceApproved--,
37273727
CASE WHEN @Scope > 0 THEN CONCAT(CS.RejectionReason,' - ', XCS.Name) ELSE NULL END ServiceRejectionReason,
37283728
CASE WHEN @Scope > 0 THEN CONCAT(CI.RejectionReason, ' - ', XCI.Name) ELSE NULL END ItemRejectionReason
@@ -4067,26 +4067,26 @@ Go
40674067
COALESCE(TFI.Approved + TFS.Approved, TFI.Approved, TFS.Approved) Approved,
40684068
COALESCE(TFI.Adjusted + TFS.Adjusted, TFI.Adjusted, TFS.Adjusted) Adjusted,
40694069
COALESCE(TFI.Remunerated + TFS.Remunerated, TFI.Remunerated, TFS.Remunerated)Paid,
4070-
CASE WHEN @Scope > 0 AND CI.RejectionReason <> 0 THEN I.ItemCode ELSE NULL END RejectedItem, CI.RejectionReason ItemRejectionCode,
4071-
CASE WHEN @Scope > 0 AND CS.RejectionReason <> 0 THEN S.ServCode ELSE NULL END RejectedService, CS.RejectionReason ServiceRejectionCode,
4072-
CASE WHEN @Scope > 0 AND CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN I.ItemCode ELSE NULL END AdjustedItem,
4073-
CASE WHEN @Scope > 0 AND CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN CI.QtyProvided ELSE NULL END OrgQtyItem,
4074-
CASE WHEN @Scope > 0 AND CI.QtyProvided <> COALESCE(CI.QtyApproved ,CI.QtyProvided) THEN CI.QtyApproved ELSE NULL END AdjQtyItem,
4075-
CASE WHEN @Scope > 0 AND CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN S.ServCode ELSE NULL END AdjustedService,
4076-
CASE WHEN @Scope > 0 AND CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN CS.QtyProvided ELSE NULL END OrgQtyService,
4077-
CASE WHEN @Scope > 0 AND CS.QtyProvided <> COALESCE(CS.QtyApproved ,CS.QtyProvided) THEN CS.QtyApproved ELSE NULL END AdjQtyService,
4070+
CASE WHEN @Scope =2 OR CI.RejectionReason <> 0 THEN I.ItemCode ELSE NULL END RejectedItem, CI.RejectionReason ItemRejectionCode,
4071+
CASE WHEN @Scope =2 OR CS.RejectionReason <> 0 THEN S.ServCode ELSE NULL END RejectedService, CS.RejectionReason ServiceRejectionCode,
4072+
CASE WHEN @Scope =2 OR CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN I.ItemCode ELSE NULL END AdjustedItem,
4073+
CASE WHEN @Scope =2 OR CI.QtyProvided <> COALESCE(CI.QtyApproved,CI.QtyProvided) THEN ISNULL(CI.QtyProvided,0) ELSE NULL END OrgQtyItem,
4074+
CASE WHEN @Scope =2 OR CI.QtyProvided <> COALESCE(CI.QtyApproved ,CI.QtyProvided) THEN ISNULL(CI.QtyApproved,0) ELSE NULL END AdjQtyItem,
4075+
CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN S.ServCode ELSE NULL END AdjustedService,
4076+
CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved,CS.QtyProvided) THEN ISNULL(CS.QtyProvided,0) ELSE NULL END OrgQtyService,
4077+
CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved ,CS.QtyProvided) THEN ISNULL(CS.QtyApproved,0) ELSE NULL END AdjQtyService,
40784078
C.Explanation,
40794079
-- ALL claims
4080-
CASE WHEN @Scope = 2 THEN CS.QtyApproved ELSE NULL END ServiceQtyApproved,
4081-
CASE WHEN @Scope = 2 THEN CI.QtyApproved ELSE NULL END ItemQtyApproved,
4082-
CASE WHEN @Scope = 2 THEN cs.PriceAsked ELSE NULL END ServicePrice,
4083-
CASE WHEN @Scope = 2 THEN CI.PriceAsked ELSE NULL END ItemPrice,
4084-
CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceApproved,0) ELSE NULL END ServicePriceApproved,
4085-
CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceApproved,0) ELSE NULL END ItemPriceApproved,
4086-
CASE WHEN @Scope = 2 THEN ISNULL(cs.Justification,NULL) ELSE NULL END ServiceJustification,
4087-
CASE WHEN @Scope = 2 THEN ISNULL(CI.Justification,NULL) ELSE NULL END ItemJustification,
4088-
CASE WHEN @Scope = 2 THEN cs.ClaimServiceID ELSE NULL END ClaimServiceID,
4089-
CASE WHEN @Scope = 2 THEN CI.ClaimItemID ELSE NULL END ClaimItemID,
4080+
CASE WHEN @Scope = 2 THEN CS.QtyApproved ELSE NULL END ServiceQtyApproved,
4081+
CASE WHEN @Scope = 2 THEN CI.QtyApproved ELSE NULL END ItemQtyApproved,
4082+
CASE WHEN @Scope = 2 THEN cs.PriceAsked ELSE NULL END ServicePrice,
4083+
CASE WHEN @Scope = 2 THEN CI.PriceAsked ELSE NULL END ItemPrice,
4084+
CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceApproved,0) ELSE NULL END ServicePriceApproved,
4085+
CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceApproved,0) ELSE NULL END ItemPriceApproved,
4086+
CASE WHEN @Scope = 2 THEN ISNULL(cs.Justification,NULL) ELSE NULL END ServiceJustification,
4087+
CASE WHEN @Scope = 2 THEN ISNULL(CI.Justification,NULL) ELSE NULL END ItemJustification,
4088+
CASE WHEN @Scope = 2 THEN cs.ClaimServiceID ELSE NULL END ClaimServiceID,
4089+
CASE WHEN @Scope = 2 THEN CI.ClaimItemID ELSE NULL END ClaimItemID,
40904090
--,cs.PriceApproved ServicePriceApproved,ci.PriceApproved ItemPriceApproved--,
40914091
CASE WHEN @Scope > 0 THEN CONCAT(CS.RejectionReason,' - ', XCS.Name) ELSE NULL END ServiceRejectionReason,
40924092
CASE WHEN @Scope > 0 THEN CONCAT(CI.RejectionReason, ' - ', XCI.Name) ELSE NULL END ItemRejectionReason,

0 commit comments

Comments
 (0)