Skip to content

Commit 8b862a8

Browse files
authored
Fix the column mismatch issue in beneficiary search (#142)
* fix: column mismatch issue * fix: update marital status
1 parent 0590a0c commit 8b862a8

File tree

1 file changed

+42
-41
lines changed

1 file changed

+42
-41
lines changed

src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -165,53 +165,54 @@ MBeneficiarymapping getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger van
165165
*/
166166
@Query(value = "SELECT " +
167167
"m.BenRegId, " + // 0
168-
"brm.BeneficiaryId, " +
168+
"brm.BeneficiaryId, " + // 1
169169
"d.FirstName, " + // 2
170-
"d.LastName, " + // 3
171-
"d.GenderID, " + // 4
172-
"g.GenderName, " + // 5
173-
"d.DOB, " + // 6
174-
"TIMESTAMPDIFF(YEAR, d.DOB, CURDATE()), " + // 7 - age
175-
"d.FatherName, " + // 8
176-
"d.SpouseName, " + // 9
177-
"d.IsHIVPositive, " + // 10
178-
"m.CreatedBy, " + // 11
179-
"m.CreatedDate, " + // 12
180-
"UNIX_TIMESTAMP(m.LastModDate) * 1000, " + // 13
181-
"m.BenAccountID, " + // 14
182-
"contact.PreferredPhoneNum, " + // 15
183-
// "h.HealthID, " + "h.HealthIDNumber, " +
184-
"fam.BenFamilyMapId, " +
185-
"addr.CurrStateId, " + // 19
186-
"addr.CurrState, " + // 20
187-
"addr.CurrDistrictId, " + // 21
188-
"addr.CurrDistrict, " + // 22
189-
"addr.CurrSubDistrictId, " + // 23
190-
"addr.CurrSubDistrict, " + // 24
191-
"addr.CurrVillageId, " + // 25
192-
"addr.CurrVillage, " + // 26
193-
"addr.CurrPinCode, " + // 27
194-
"addr.CurrServicePointId, " + // 28
195-
"addr.CurrServicePoint, " + // 29
196-
"addr.ParkingPlaceID, " + // 30
197-
"addr.PermStateId, " + // 31
198-
"addr.PermState, " + // 32
199-
"addr.PermDistrictId, " + // 33
200-
"addr.PermDistrict, " + // 34
201-
"addr.PermSubDistrictId, " + // 35
202-
"addr.PermSubDistrict, " + // 36
203-
"addr.PermVillageId, " + // 37
204-
"addr.PermVillage " + // 38
205-
// "id.GovtIdentityNo, " + // 39 - Aadhar/Govt ID
206-
// "id.IdentityNo " + // 40 - Another identity
170+
"d.MiddleName, " + // 3
171+
"d.LastName, " + // 4
172+
"d.GenderID, " + // 5
173+
"g.GenderName, " + // 6
174+
"d.DOB, " + // 7
175+
"TIMESTAMPDIFF(YEAR, d.DOB, CURDATE()), " + // 8 - age
176+
"d.FatherName, " + // 9
177+
"d.SpouseName, " + // 10
178+
"d.MaritalStatusID, " + // 11
179+
"ms.Status as MaritalStatusName, " + // 12 - MaritalStatusName
180+
"d.IsHIVPositive, " + // 13
181+
"m.CreatedBy, " + // 14
182+
"m.CreatedDate, " + // 15
183+
"UNIX_TIMESTAMP(m.LastModDate) * 1000, " + // 16
184+
"m.BenAccountID, " + // 17
185+
"contact.PreferredPhoneNum, " + // 18
186+
"fam.BenFamilyMapId, " + // 19
187+
"addr.CurrStateId, " + // 20
188+
"addr.CurrState, " + // 21
189+
"addr.CurrDistrictId, " + // 22
190+
"addr.CurrDistrict, " + // 23
191+
"addr.CurrSubDistrictId, " + // 24
192+
"addr.CurrSubDistrict, " + // 25
193+
"addr.CurrVillageId, " + // 26
194+
"addr.CurrVillage, " + // 27
195+
"addr.CurrPinCode, " + // 28
196+
"addr.CurrServicePointId, " + // 29
197+
"addr.CurrServicePoint, " + // 30
198+
"addr.ParkingPlaceID, " + // 31
199+
"addr.PermStateId, " + // 32
200+
"addr.PermState, " + // 33
201+
"addr.PermDistrictId, " + // 34
202+
"addr.PermDistrict, " + // 35
203+
"addr.PermSubDistrictId, " + // 36
204+
"addr.PermSubDistrict, " + // 37
205+
"addr.PermVillageId, " + // 38
206+
"addr.PermVillage " + // 39
207207
"FROM i_beneficiarymapping m " +
208208
"LEFT JOIN i_beneficiarydetails d ON m.BenDetailsId = d.BeneficiaryDetailsID " +
209209
"LEFT JOIN db_iemr.m_gender g ON d.GenderID = g.GenderID " +
210+
"LEFT JOIN db_iemr.m_maritalstatus ms ON d.MaritalStatusID = ms.MaritalStatusID " +
210211
"LEFT JOIN i_beneficiaryaddress addr ON m.BenAddressId = addr.BenAddressID " +
211212
"LEFT JOIN i_beneficiarycontacts contact ON m.BenContactsId = contact.BenContactsID " +
212-
"LEFT JOIN m_beneficiaryregidmapping brm ON brm.BenRegId = m.BenRegId " +
213-
"LEFT JOIN db_iemr.m_benhealthidmapping h ON m.BenRegId = h.BeneficiaryRegID " +
214-
"LEFT JOIN i_beneficiaryfamilymapping fam " +
213+
"LEFT JOIN m_beneficiaryregidmapping brm ON brm.BenRegId = m.BenRegId " +
214+
"LEFT JOIN db_iemr.m_benhealthidmapping h ON m.BenRegId = h.BeneficiaryRegID " +
215+
"LEFT JOIN i_beneficiaryfamilymapping fam " +
215216
" ON m.BenRegId = fam.AssociatedBenRegID " +
216217
" AND fam.Deleted = false " +
217218
"WHERE m.BenRegId IN :benRegIds " +

0 commit comments

Comments
 (0)