Skip to content

fix: 2346 handling duplicate entry of clinical observation #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snehar-nd merged 2 commits into from
Jun 22, 2026
Merged

fix: 2346 handling duplicate entry of clinical observation #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73cf097
fix: 2346 handling duplicate entry of clinical observation
Jun 19, 2026
3916bc0
fix: 2346 ignoring softdeleted data
Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/tm/repo/quickConsultation/BenClinicalObservationsRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface BenClinicalObservationsRepo extends CrudRepository<BenClinicalO
+ "WHERE ba.beneficiaryRegID = :benRegID AND ba.deleted = false AND ba.visitCode = :visitCode")
public ArrayList<Object[]> getFindingsData(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);

@Query("SELECT processed from BenClinicalObservations where beneficiaryRegID=:benRegID AND visitCode = :visitCode")
@Query("SELECT processed from BenClinicalObservations where beneficiaryRegID=:benRegID AND visitCode = :visitCode AND deleted = false ORDER BY clinicalObservationID DESC LIMIT 1")
public String getBenClinicalObservationStatus(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);

@Transactional
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/com/iemr/tm/service/common/transaction/CommonDoctorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,21 @@

}

public Integer saveDocFindings(WrapperAncFindings wrapperAncFindings) {

Check failure on line 193 in src/main/java/com/iemr/tm/service/common/transaction/CommonDoctorServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZ7fCaiBDQLnfF7XvX13&open=AZ7fCaiBDQLnfF7XvX13&pullRequest=152
int i = 0;
int clinicalObservationFlag = 0;
int chiefComFlag = 0;

// save clinical observation
BenClinicalObservations benClinicalObservationsRS = benClinicalObservationsRepo
.save(getBenClinicalObservations(wrapperAncFindings));
if (benClinicalObservationsRS != null) {
// save clinical observation — guard against duplicate insert for same visit
String existingObsStatus = benClinicalObservationsRepo.getBenClinicalObservationStatus(
wrapperAncFindings.getBeneficiaryRegID(), wrapperAncFindings.getVisitCode());
if (existingObsStatus == null) {
BenClinicalObservations benClinicalObservationsRS = benClinicalObservationsRepo
.save(getBenClinicalObservations(wrapperAncFindings));
if (benClinicalObservationsRS != null) {
clinicalObservationFlag = 1;
}
} else {
clinicalObservationFlag = 1;
}

Expand Down
Loading