Move code from Release 3.4.0 to Main

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.mmu</groupId>
 	<artifactId>mmu-api</artifactId>
-	<version>3.1.0</version>
+	<version>3.4.0</version>
 	<packaging>war</packaging>
 
 	<name>MMU-API</name>
@@ -47,12 +47,22 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
+			<!-- <exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-logging</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> -->
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>co.elastic.logging</groupId>
@@ -163,6 +173,17 @@
 			<artifactId>jackson-datatype-joda</artifactId>
 			<version>2.17.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
@@ -179,12 +200,6 @@
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
 			<version>5.2.5</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.commons</groupId>
-					<artifactId>commons-compress</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis -->
 		<dependency>

src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java

@@ -25,7 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -37,8 +36,8 @@
 import com.iemr.mmu.service.dataSyncActivity.DownloadDataFromServerImpl;
 import com.iemr.mmu.service.dataSyncActivity.DownloadDataFromServerTransactionalImpl;
 import com.iemr.mmu.service.dataSyncActivity.UploadDataToServerImpl;
-import com.iemr.mmu.utils.response.OutputResponse;
 import com.iemr.mmu.utils.CookieUtil;
+import com.iemr.mmu.utils.response.OutputResponse;
 
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletRequest;
@@ -181,6 +180,8 @@ public String callCentralAPIToGenerateBenIDAndimportToLocal(@RequestBody String
 		OutputResponse response = new OutputResponse();
 		try {
 			String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
+			logger.info("Authorization from controller="+ authorization);
+
 			int i = downloadDataFromServerImpl.callCentralAPIToGenerateBenIDAndimportToLocal(requestOBJ, authorization,
 					serverAuthorization, jwtToken);
 			if (i == 0) {

src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java

@@ -36,9 +36,11 @@
 import com.iemr.mmu.service.dataSyncLayerCentral.FetchDownloadDataImpl;
 import com.iemr.mmu.service.dataSyncLayerCentral.GetDataFromVanAndSyncToDBImpl;
 import com.iemr.mmu.service.dataSyncLayerCentral.GetMasterDataFromCentralForVanImpl;
+import com.iemr.mmu.utils.CookieUtil;
 import com.iemr.mmu.utils.response.OutputResponse;
 
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
 
 /***
  * @operation Class used for data sync from van-to-server & server-to-van
@@ -58,8 +60,9 @@ public class MMUDataSyncVanToServer {
 	@Operation(summary = "Sync data from van-to-server")
 	@PostMapping(value = { "/van-to-server" }, consumes = "application/json", produces = "application/json")
 	public String dataSyncToServer(@RequestBody String requestOBJ,
-			@RequestHeader(value = "Authorization") String Authorization) {
+			@RequestHeader(value = "Authorization") String Authorization,  HttpServletRequest request) {
 		OutputResponse response = new OutputResponse();
+
 		try {
 			String s = getDataFromVanAndSyncToDBImpl.syncDataToServer(requestOBJ, Authorization);
 			if (s != null)

src/main/java/com/iemr/mmu/data/anc/BenPersonalHabit.java

@@ -93,6 +93,10 @@ public class BenPersonalHabit {
 	@Column(name = "NumberperDay")
 	private Short numberperDay;
 
+	@Expose
+	@Column(name = "NumberperWeek")
+	private Short numberperWeek;
+
 	@Expose
 	@Column(name = "TobaccoUseDuration")
 	private Timestamp tobaccoUseDuration;
@@ -333,10 +337,18 @@ public Short getNumberperDay() {
 		return numberperDay;
 	}
 
+	public Short getNumberperWeek() {
+		return numberperWeek;
+	}
+
 	public void setNumberperDay(Short numberperDay) {
 		this.numberperDay = numberperDay;
 	}
 
+	public void setNumberperWeek(Short numberperWeek) {
+		this.numberperWeek = numberperWeek;
+	}
+
 	public Timestamp getTobaccoUseDuration() {
 		return tobaccoUseDuration;
 	}
@@ -579,6 +591,9 @@ public ArrayList<BenPersonalHabit> getPersonalHistory() {
 					if (null != tobaccoInfo.get("numberperDay")) {
 						benPersonalHabit.setNumberperDay(new Short(tobaccoInfo.get("numberperDay")));
 					}
+					if (null != tobaccoInfo.get("numberperWeek")) {
+						benPersonalHabit.setNumberperWeek(new Short(tobaccoInfo.get("numberperWeek")));
+					}
 					timePeriodUnit = (String) tobaccoInfo.get("durationUnit");
 
 					if (null != tobaccoInfo.get("duration")) {
@@ -634,7 +649,7 @@ public ArrayList<BenPersonalHabit> getPersonalHistory() {
 	}
 
 	public BenPersonalHabit(Date createdDate, String dietaryType, String physicalActivityType, String tobaccoUseStatus,
-			String tobaccoUseType, String otherTobaccoUseType, Short numberperDay, Date tobaccoUseDuration,
+			String tobaccoUseType, String otherTobaccoUseType, Short numberperDay, Short numberperWeek, Date tobaccoUseDuration,
 			Character riskySexualPracticesStatus) {
 		super();
 		this.captureDate = createdDate;
@@ -650,6 +665,8 @@ public BenPersonalHabit(Date createdDate, String dietaryType, String physicalAct
 		} else if(riskySexualPracticesStatus !=null && riskySexualPracticesStatus == '1') {
 			this.riskySexualPracticeStatus = "Yes";
 		}
+		this.numberperWeek = numberperWeek;
+
 	}
 
 	public BenPersonalHabit(Date createdDate, String dietaryType, String physicalActivityType,
@@ -687,7 +704,7 @@ public BenPersonalHabit(Long beneficiaryRegID, Long benVisitID, Integer provider
 	}
 
 	public BenPersonalHabit(String tobaccoUseTypeID, String tobaccoUseType, String otherTobaccoUseType,
-			Short numberperDay, Timestamp tobaccoUseDuration, String alcoholTypeID, String alcoholType,
+			Short numberperDay, Short numberperWeek, Timestamp tobaccoUseDuration, String alcoholTypeID, String alcoholType,
 			String otherAlcoholType, String alcoholIntakeFrequency, String avgAlcoholConsumption,
 			Timestamp alcoholDuration, Timestamp createdDate, Long visitCode) {
 		super();
@@ -704,6 +721,7 @@ public BenPersonalHabit(String tobaccoUseTypeID, String tobaccoUseType, String o
 		this.alcoholDuration = alcoholDuration;
 		this.createdDate = createdDate;
 		this.visitCode = visitCode;
+		this.numberperWeek = numberperWeek;
 	}
 
 	public static BenPersonalHabit getPersonalDetails(ArrayList<Object[]> personalHistoryDetails) {
@@ -712,15 +730,15 @@ public static BenPersonalHabit getPersonalDetails(ArrayList<Object[]> personalHi
 			Object[] obj1 = personalHistoryDetails.get(0);
 
 			personalDetails = new BenPersonalHabit((Long) obj1[0], (Long) obj1[1], (Integer) obj1[2], (String) obj1[3],
-					(String) obj1[4], (String) obj1[5], (String) obj1[11], (Character) obj1[18]);
+					(String) obj1[4], (String) obj1[5], (String) obj1[12], (Character) obj1[19]);
 
 			ArrayList<Map<String, String>> tobaccoList = new ArrayList<Map<String, String>>();
 			ArrayList<Map<String, String>> alcoholList = new ArrayList<Map<String, String>>();
 			for (Object[] obj : personalHistoryDetails) {
 				BenPersonalHabit personalHabits = new BenPersonalHabit((String) obj[6], (String) obj[7],
-						(String) obj[8], (Short) obj[9], (Timestamp) obj[10], (String) obj[12], (String) obj[13],
-						(String) obj[14], (String) obj[15], (String) obj[16], (Timestamp) obj[17], (Timestamp) obj[19],
-						(Long) obj[20]);
+						(String) obj[8], (Short) obj[9], (Short) obj[10], (Timestamp) obj[11], (String) obj[13], (String) obj[14],
+						(String) obj[15], (String) obj[16], (String) obj[17], (Timestamp) obj[18], (Timestamp) obj[20],
+						(Long) obj[21]);
 
 				Map<String, Object> timePeriod = null;
 				// Integer timePeriodAgo = null;
@@ -732,7 +750,10 @@ public static BenPersonalHabit getPersonalDetails(ArrayList<Object[]> personalHi
 					if (null != personalHabits.getNumberperDay()) {
 						tobaccoInfo.put("numberperDay", personalHabits.getNumberperDay().toString());
 					}
-
+					if (null != personalHabits.getNumberperWeek()) {
+						tobaccoInfo.put("numberperWeek", personalHabits.getNumberperWeek().toString());
+					}
+
 					timePeriod = Utility.convertTimeToWords(personalHabits.getTobaccoUseDuration(),
 							personalHabits.getCreatedDate());
 

src/main/java/com/iemr/mmu/data/benFlowStatus/BeneficiaryFlowStatus.java

@@ -324,7 +324,7 @@ public BeneficiaryFlowStatus() {
 	public BeneficiaryFlowStatus(Long benFlowID, Long benRegID, Timestamp visitDate, String benName, String age,
 			Integer ageVal, Short genderID, String genderName, String villageName, String districtName,
 			Long beneficiaryID, String servicePoint, String VisitReason, String VisitCategory, Long benVisitID,
-			Timestamp regDate, Timestamp benVisitDate, Long visitCode, Timestamp consultationDate) {
+			Timestamp regDate, Timestamp benVisitDate, Long visitCode, Timestamp consultationDate, String fatherName, String preferredPhoneNum) {
 		this.benFlowID = benFlowID;
 		this.beneficiaryRegID = benRegID;
 		this.serviceDate = benVisitDate;
@@ -344,6 +344,8 @@ public BeneficiaryFlowStatus(Long benFlowID, Long benRegID, Timestamp visitDate,
 		this.visitCode = visitCode;
 		this.consultationDate = consultationDate;
 		this.bloodGroup = null;
+		this.fatherName = fatherName;
+		this.preferredPhoneNum = preferredPhoneNum;
 
 	}
 
@@ -366,7 +368,8 @@ public static BeneficiaryFlowStatus getBeneficiaryFlowStatusForLeftPanel(ArrayLi
 						(String) objArr[3], (String) objArr[4], (Integer) objArr[5], (Short) objArr[6],
 						(String) objArr[7], (String) objArr[8], (String) objArr[9], (Long) objArr[10],
 						(String) objArr[11], (String) objArr[12], (String) objArr[13], (Long) objArr[14],
-						(Timestamp) objArr[15], (Timestamp) objArr[16], (Long) objArr[17], (Timestamp) objArr[18]);
+						(Timestamp) objArr[15], (Timestamp) objArr[16], (Long) objArr[17], (Timestamp) objArr[18], 
+						(String) objArr[19], (String) objArr[20]);
 			}
 		}
 		return obj;

src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java

@@ -22,7 +22,9 @@
 package com.iemr.mmu.data.doctor;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -33,9 +35,14 @@
 import jakarta.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.Expose;
+import lombok.Data;
+
+import lombok.Data;
 
 @Entity
+@Data
 @Table(name = "t_cancergynecologicalexamination")
 public class CancerGynecologicalExamination {
 	@Id
@@ -92,10 +99,19 @@ public class CancerGynecologicalExamination {
 	@Column(name = "RTIOrSTIDetail")
 	private String rTIOrSTIDetail;
 
+	@Expose
+	@Transient
+	@JsonProperty("fileIDs")
+	private List<String> fileIDs;
+
 	@Expose
 	@Column(name = "FilePath")
 	private String filePath;
 
+	@Expose
+	@Transient
+	private ArrayList<Map<String, String>> files;
+
 	@Expose
 	@Column(name = "ExperiencedPostCoitalBleeding")
 	private Boolean experiencedPostCoitalBleeding;
@@ -422,4 +438,14 @@ public void setVisitCode(Long visitCode) {
 		this.visitCode = visitCode;
 	}
 
+
+	public ArrayList<Map<String, String>> getFiles() {
+		return files;
+	}
+
+	public void setFiles(ArrayList<Map<String, String>> files) {
+		this.files = files;
+	}
+
+
 }

src/main/java/com/iemr/mmu/data/quickConsultation/BenClinicalObservations.java

@@ -34,7 +34,10 @@
 
 import com.google.gson.annotations.Expose;
 
+import lombok.Data;
+
 @Entity
+@Data
 @Table(name = "t_benclinicalobservation")
 public class BenClinicalObservations {
 	@Id

src/main/java/com/iemr/mmu/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java

@@ -75,7 +75,7 @@ public int updateBenFlowStatusTMReferred(@Param("benFlowID") Long benFlowID, @Pa
 
 	@Query("SELECT  t.benFlowID, t.beneficiaryRegID, t.visitDate, t.benName, t.age, t.ben_age_val, t.genderID, t.genderName, "
 			+ " t.villageName, t.districtName, t.beneficiaryID, t.servicePointName, t.VisitReason, t.VisitCategory, t.benVisitID,  "
-			+ " t.registrationDate, t.benVisitDate, t.visitCode, t.consultationDate FROM BeneficiaryFlowStatus t "
+			+ " t.registrationDate, t.benVisitDate, t.visitCode, t.consultationDate, t.fatherName, t.preferredPhoneNum FROM BeneficiaryFlowStatus t "
 			+ " Where t.beneficiaryRegID = :benRegID AND t.benFlowID = :benFlowID ")
 	public ArrayList<Object[]> getBenDetailsForLeftSidePanel(@Param("benRegID") Long benRegID,
 			@Param("benFlowID") Long benFlowID);

src/main/java/com/iemr/mmu/repo/location/DistrictBlockMasterRepo.java

@@ -36,7 +36,7 @@ public interface DistrictBlockMasterRepo extends CrudRepository<DistrictBlock, I
 	@Query(" SELECT blockID, blockName FROM DistrictBlock WHERE districtID = :districtID AND deleted != true ")
 	public ArrayList<Object[]> getDistrictBlockMaster(@Param("districtID") Integer districtID);
 
-	@Query(value = " SELECT distinct StateID, StateName,WorkingDistrictID,WorkingDistrictName,blockid,blockname,villageid,villagename FROM db_iemr.v_userservicerolemapping WHERE UserID = :userId and UserServciceRoleDeleted is false",nativeQuery = true)
+	@Query(value = " SELECT distinct StateID, StateName,WorkingDistrictID,WorkingDistrictName,blockid,blockname,villageid,villagename FROM v_userservicerolemapping WHERE UserID = :userId and UserServciceRoleDeleted is false",nativeQuery = true)
 	public List<Object[]> getUserservicerolemapping(@Param("userId") Integer userId);
 
 }

src/main/java/com/iemr/mmu/repo/nurse/BenVisitDetailRepo.java

@@ -68,7 +68,7 @@ public Integer updateBenFlowStatus(@Param("visitFlowStatusFlag") String visitFlo
 			+ "bvd.reportFilePath,sp.serviceProviderName from BeneficiaryVisitDetail bvd "
 			+ "INNER JOIN bvd.providerServiceMapping p " + "INNER JOIN p.serviceProvider sp "
 			+ "WHERE bvd.beneficiaryRegID = :benRegID AND bvd.visitCode = :visitCode ")
-	public List<Objects[]> getBeneficiaryVisitDetails(@Param("benRegID") Long benRegID,
+	public List<Object[]> getBeneficiaryVisitDetails(@Param("benRegID") Long benRegID,
 			@Param("visitCode") Long visitCode);
 
 	@Query(" SELECT COUNT(benVisitID) FROM BeneficiaryVisitDetail WHERE beneficiaryRegID = :benRegID GROUP BY beneficiaryRegID ")

src/main/java/com/iemr/mmu/repo/nurse/anc/BenPersonalHabitRepo.java

@@ -39,7 +39,7 @@ public interface BenPersonalHabitRepo extends CrudRepository<BenPersonalHabit, I
 	@Query("select benVisitID from BenPersonalHabit a where a.beneficiaryRegID = :beneficiaryRegID order by benVisitID desc")
 	public ArrayList<Long> getBenLastVisitID(@Param("beneficiaryRegID") Long beneficiaryRegID);
 
-	@Query("select Date(createdDate), dietaryType, physicalActivityType, tobaccoUseStatus, tobaccoUseType, otherTobaccoUseType, numberperDay, "
+	@Query("select Date(createdDate), dietaryType, physicalActivityType, tobaccoUseStatus, tobaccoUseType, otherTobaccoUseType, numberperDay, numberperWeek, "
 			+ "Date(tobaccoUseDuration), riskySexualPracticesStatus from BenPersonalHabit a where a.beneficiaryRegID = :beneficiaryRegID "
 			+ "AND tobaccoUseStatus is not null AND deleted = false order by createdDate DESC")
 	public ArrayList<Object[]> getBenPersonalTobaccoHabitDetail(@Param("beneficiaryRegID") Long beneficiaryRegID);
@@ -51,7 +51,7 @@ public interface BenPersonalHabitRepo extends CrudRepository<BenPersonalHabit, I
 	public ArrayList<Object[]> getBenPersonalAlcoholHabitDetail(@Param("beneficiaryRegID") Long beneficiaryRegID);
 
 	@Query(" SELECT beneficiaryRegID, benVisitID, providerServiceMapID, dietaryType, physicalActivityType, tobaccoUseStatus, tobaccoUseTypeID, "
-			+ "tobaccoUseType, otherTobaccoUseType, numberperDay, tobaccoUseDuration, alcoholIntakeStatus, alcoholTypeID, "
+			+ "tobaccoUseType, otherTobaccoUseType, numberperDay, numberperWeek, tobaccoUseDuration, alcoholIntakeStatus, alcoholTypeID, "
 			+ "alcoholType, otherAlcoholType, alcoholIntakeFrequency, avgAlcoholConsumption, alcoholDuration, riskySexualPracticesStatus, createdDate, visitCode   "
 			+ "FROM BenPersonalHabit WHERE beneficiaryRegID = :benRegID AND deleted = false AND visitCode = :visitCode")
 	public ArrayList<Object[]> getBenPersonalHabitDetail(@Param("benRegID") Long benRegID,