Merge pull request #106 from ravishanigarapu/develop

ServiceID changes
PSMRI · Nov 18, 2024 · 2be93bd · 2be93bd
2 parents a6869b5 + 2d9f455
commit 2be93bd
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git 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
diff --git 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
diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Short> flagList = new ArrayList<>();
 		// flagList.add((short) 9);
 		// flagList.add((short) 3);
-		List<Integer> psmIDList = providerServiceMappingRepo.getProviderServiceMapIdForServiceID((short) 4);
+		List<Integer> psmIDList = providerServiceMappingRepo.getProviderServiceMapIdForServiceID((short) 9);
 		psmIDList.add(0);
 		ArrayList<Object[]> resultList = beneficiaryFlowStatusRepo.getBenPreviousHistory(obj.getBeneficiaryRegID(),
 				psmIDList);