From f449b2ceb9820736aa856841bb4ab6230f210a97 Mon Sep 17 00:00:00 2001 From: SR20290919 Date: Sat, 24 May 2025 16:24:17 +0530 Subject: [PATCH 1/5] setting dependency of disease repo --- .../helpline104/service/disease/DiseaseServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java b/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java index dfd8a46..e72100c 100644 --- a/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java +++ b/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java @@ -42,6 +42,7 @@ import org.springframework.stereotype.Service; import com.iemr.helpline104.data.disease.Disease; +import com.iemr.helpline104.repository.beneficiarycall.BeneficiaryCallRepository; import com.iemr.helpline104.repository.disease.DiseaseRepository; import com.iemr.helpline104.utils.exception.IEMRException; import com.iemr.helpline104.utils.mapper.InputMapper; @@ -54,9 +55,14 @@ public class DiseaseServiceImpl implements DiseaseService{ @PersistenceContext private EntityManager entityManager; - @Autowired +// @Autowired DiseaseRepository diseaseRepository; + @Autowired + private void setDiseaseRepository(DiseaseRepository diseaseRepository) { + this.diseaseRepository = diseaseRepository; + } + @Override public String saveDisease(String request) { logger.info("saveDisease - Start"); From 7de64ca3cf89fe8d876c9ea172449ec306bb7cb0 Mon Sep 17 00:00:00 2001 From: SR20290919 Date: Sat, 24 May 2025 17:17:23 +0530 Subject: [PATCH 2/5] changing alias name in query --- .../iemr/helpline104/repository/disease/DiseaseRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java b/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java index a3d40d4..6b1d4ed 100644 --- a/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java +++ b/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java @@ -44,7 +44,7 @@ public interface DiseaseRepository extends CrudRepository { @Query("UPDATE Disease set deleted = :deleted where diseasesummaryID = :diseasesummaryID") public int deleteDisease(@Param("diseasesummaryID") Integer diseasesummaryID,@Param("deleted") Boolean deleted); - @Query("Select count(*) from Disease disease d where d.deleted = false") + @Query("Select count(d) from Disease disease d where d.deleted = false") public Integer getDiseaseCountExcludingDeleted(); @Transactional From 8f3524414999d189bfad30606a70b6765df38e72 Mon Sep 17 00:00:00 2001 From: SR20290919 Date: Sat, 24 May 2025 17:18:43 +0530 Subject: [PATCH 3/5] adding spaces --- .../helpline104/service/disease/DiseaseServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java b/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java index e72100c..51f239f 100644 --- a/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java +++ b/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java @@ -42,7 +42,6 @@ import org.springframework.stereotype.Service; import com.iemr.helpline104.data.disease.Disease; -import com.iemr.helpline104.repository.beneficiarycall.BeneficiaryCallRepository; import com.iemr.helpline104.repository.disease.DiseaseRepository; import com.iemr.helpline104.utils.exception.IEMRException; import com.iemr.helpline104.utils.mapper.InputMapper; @@ -55,13 +54,9 @@ public class DiseaseServiceImpl implements DiseaseService{ @PersistenceContext private EntityManager entityManager; -// @Autowired - DiseaseRepository diseaseRepository; @Autowired - private void setDiseaseRepository(DiseaseRepository diseaseRepository) { - this.diseaseRepository = diseaseRepository; - } + DiseaseRepository diseaseRepository; @Override public String saveDisease(String request) { From 97c745919d74d0a75996e8425ecc22c88b38915b Mon Sep 17 00:00:00 2001 From: SR20290919 Date: Sat, 24 May 2025 17:19:39 +0530 Subject: [PATCH 4/5] putting missing import --- .../iemr/helpline104/service/disease/DiseaseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java b/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java index 51f239f..666dd77 100644 --- a/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java +++ b/src/main/java/com/iemr/helpline104/service/disease/DiseaseServiceImpl.java @@ -43,6 +43,7 @@ import com.iemr.helpline104.data.disease.Disease; import com.iemr.helpline104.repository.disease.DiseaseRepository; +import com.iemr.helpline104.service.disease.DiseaseService; import com.iemr.helpline104.utils.exception.IEMRException; import com.iemr.helpline104.utils.mapper.InputMapper; @@ -53,7 +54,6 @@ public class DiseaseServiceImpl implements DiseaseService{ @PersistenceContext private EntityManager entityManager; - @Autowired DiseaseRepository diseaseRepository; From d478e65c8782e2828031a2d78de4dedd6d4de532 Mon Sep 17 00:00:00 2001 From: SR20290919 Date: Sat, 24 May 2025 17:26:21 +0530 Subject: [PATCH 5/5] removing duplicate alias name --- .../iemr/helpline104/repository/disease/DiseaseRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java b/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java index 6b1d4ed..ffa6b58 100644 --- a/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java +++ b/src/main/java/com/iemr/helpline104/repository/disease/DiseaseRepository.java @@ -44,7 +44,7 @@ public interface DiseaseRepository extends CrudRepository { @Query("UPDATE Disease set deleted = :deleted where diseasesummaryID = :diseasesummaryID") public int deleteDisease(@Param("diseasesummaryID") Integer diseasesummaryID,@Param("deleted") Boolean deleted); - @Query("Select count(d) from Disease disease d where d.deleted = false") + @Query("Select count(disease) from Disease disease where disease.deleted = false") public Integer getDiseaseCountExcludingDeleted(); @Transactional