From a16065cd377935794517d7fd5f936912eace145c Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 18 Nov 2024 17:45:10 +0530 Subject: [PATCH 1/4] ServiceID changes --- src/main/environment/common_ci.properties | 2 +- src/main/environment/common_dev.properties | 2 +- .../environment/common_example.properties | 2 +- src/main/environment/common_prod.properties | 2 +- src/main/environment/common_test.properties | 2 +- src/main/environment/common_uat.properties | 2 +- .../common/transaction/CommonServiceImpl.java | 24 +++++++++---------- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index e5ac1105..7e09d655 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -76,7 +76,7 @@ servicePointID: 235 parkingPlaceID: 233 providerServiceMapID: 1261 vanID: 220 -serviceID: 4 +serviceID: 9 providerID: 500 appId: 85696 authKey: 8BfRcBAGkTQkbQ6 diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties index 535ef2da..3cd9fe41 100644 --- a/src/main/environment/common_dev.properties +++ b/src/main/environment/common_dev.properties @@ -76,7 +76,7 @@ servicePointID= 235 parkingPlaceID= 233 providerServiceMapID= 1261 vanID= 220 -serviceID= 4 +serviceID= 9 providerID= 500 appId= 85696 authKey= 8BfRcBAGkTQkbQ6 diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 8b1b087c..7791d988 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -76,7 +76,7 @@ servicePointID= 235 parkingPlaceID= 233 providerServiceMapID= 1261 vanID= 220 -serviceID= 4 +serviceID= 9 providerID= 500 appId= 85696 authKey= 8BfRcBAGkTQkbQ6 diff --git a/src/main/environment/common_prod.properties b/src/main/environment/common_prod.properties index ef8e32b2..311823eb 100644 --- a/src/main/environment/common_prod.properties +++ b/src/main/environment/common_prod.properties @@ -78,7 +78,7 @@ servicePointID= 235 parkingPlaceID= 233 providerServiceMapID= 1261 vanID= 220 -serviceID= 4 +serviceID= 9 providerID= 500 appId= 85696 authKey= 8BfRcBAGkTQkbQ6 diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties index 88e67f0d..c86be6e7 100644 --- a/src/main/environment/common_test.properties +++ b/src/main/environment/common_test.properties @@ -80,7 +80,7 @@ servicePointID: 235 parkingPlaceID: 233 providerServiceMapID: 1261 vanID: 220 -serviceID: 4 +serviceID: 9 providerID: 500 appId: 85696 authKey: 8BfRcBAGkTQkbQ6 diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties index cc192b31..9ff26dd1 100644 --- a/src/main/environment/common_uat.properties +++ b/src/main/environment/common_uat.properties @@ -80,7 +80,7 @@ servicePointID: 235 parkingPlaceID: 233 providerServiceMapID: 1261 vanID: 220 -serviceID: 4 +serviceID: 9 providerID: 500 appId: 85696 authKey: 8BfRcBAGkTQkbQ6 diff --git a/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java b/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java index 19087979..637571d7 100644 --- a/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java @@ -225,7 +225,7 @@ private String getANC_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws IEMRExc caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -245,7 +245,7 @@ private String getCancerScreening_PrintData(BeneficiaryFlowStatus benFlowOBJ) { new Gson().toJson(cSNurseServiceImpl.getCancerExaminationImageAnnotationCasesheet( benFlowOBJ.getBeneficiaryRegID(), benFlowOBJ.getBenVisitCode()))); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -262,7 +262,7 @@ private String getGenOPD_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws Exce caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -279,7 +279,7 @@ private String getFP_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws Exceptio caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -299,7 +299,7 @@ private String getNNI_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws Excepti caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -319,7 +319,7 @@ private String getCAC_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws Excepti caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -336,7 +336,7 @@ private String getNCDcare_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws IEM caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -353,7 +353,7 @@ private String getPNC_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws IEMRExc caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -370,7 +370,7 @@ private String getQC_PrintData(BeneficiaryFlowStatus benFlowOBJ) { caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -387,7 +387,7 @@ private String getCovid19_PrintData(BeneficiaryFlowStatus benFlowOBJ) throws IEM caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -404,7 +404,7 @@ private String getNCDScreening_PrintData(BeneficiaryFlowStatus benFlowOBJ) throw caseSheetData.put("BeneficiaryData", getBenDetails(benFlowOBJ.getBenFlowID(), benFlowOBJ.getBeneficiaryRegID())); - caseSheetData.put("serviceID", 4); + caseSheetData.put("serviceID", 9); return caseSheetData.toString(); } @@ -539,7 +539,7 @@ public String getBenPreviousVisitDataForCaseRecord(String comingRequest) throws // List flagList = new ArrayList<>(); // flagList.add((short) 9); // flagList.add((short) 3); - List psmIDList = providerServiceMappingRepo.getProviderServiceMapIdForServiceID((short) 4); + List psmIDList = providerServiceMappingRepo.getProviderServiceMapIdForServiceID((short) 9); psmIDList.add(0); ArrayList resultList = beneficiaryFlowStatusRepo.getBenPreviousHistory(obj.getBeneficiaryRegID(), psmIDList); From b6ab1f6d372b03c2fcd6186eb54106b3d44d2ce9 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:00:21 +0530 Subject: [PATCH 2/4] Update build-on-pull-request.yml --- .github/workflows/build-on-pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index 6db8e884..3ca8e372 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -13,10 +13,10 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - - name: Setup JDK 8 + - name: Setup JDK 17 uses: actions/setup-java@v2 with: - java-version: 8 + java-version: 17 distribution: 'adopt' - name: Build with Maven run: mvn clean install From 9ffa0c6553c775355c03a31f436669043b8cb645 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:02:21 +0530 Subject: [PATCH 3/4] Update package.yml --- .github/workflows/package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 4bc704e1..b3ea072b 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -23,10 +23,10 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Setup JDK 8 + - name: Setup JDK 17 uses: actions/setup-java@v2 with: - java-version: 8 + java-version: 17 distribution: 'adopt' - name: Build with Maven @@ -36,7 +36,7 @@ jobs: run: mvn -B package --file pom.xml - name: Upload WAR file as artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: HWC-API path: target/hwc-facility-service.war From 2d9f45529486f18c9c2f3e94d920b15c675a4b49 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:03:26 +0530 Subject: [PATCH 4/4] Update sast.yml --- .github/workflows/sast.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml index 5a5f1fad..db02a233 100644 --- a/.github/workflows/sast.yml +++ b/.github/workflows/sast.yml @@ -36,10 +36,10 @@ jobs: with: languages: ${{ matrix.language }} - - name: Setup JDK 8 + - name: Setup JDK 17 uses: actions/setup-java@v2 with: - java-version: 8 + java-version: 17 distribution: 'adopt' - name: Build with Maven