Skip to content

Added new field for faceEmbedding #112

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
drtechie merged 2 commits into from
Aug 27, 2024
Merged

Added new field for faceEmbedding #112

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
1c74b1b
Added faceEmbedding field
Thejas775 Aug 25, 2024
7ed8cc3
Merge branch 'develop' of https://github.com/Thejas775/Common-API int…
Thejas775 Aug 25, 2024
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
3 changes: 2 additions & 1 deletion src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ public String createBeneficiary(
+ "\"healthCareWorkerID\":\"Short\",\"communityID\":\"Integer\",\"districtID\":\"Integer\",\"stateID\":\"Integer\","
+ "\"pinCode\":\"String\",\"blockID\":\"Integer\",\"districtBranchID\":\"Integer\",\"createdBy\":\"String\","
+ "\"addressLine1\":\"String\"},\"benPhoneMaps\":{\"parentBenRegID\":\"Long\",\"phoneNo\":\"String\","
+ "\"phoneTypeID\":\"Integer\",\"benRelationshipID\":\"Integer\",\"deleted\":\"Boolean\",\"createdBy\":\"String\"}}") @RequestBody BeneficiaryModel beneficiaryModel,
+ "\"phoneTypeID\":\"Integer\",\"benRelationshipID\":\"Integer\",\"deleted\":\"Boolean\",\"createdBy\":\"String\"},"
+ "\"faceEmbedding\":[\"Float\"]}") @RequestBody BeneficiaryModel beneficiaryModel,
HttpServletRequest httpRequest) {
OutputResponse response = new OutputResponse();

Expand Down
20 changes: 20 additions & 0 deletions src/main/java/com/iemr/common/data/beneficiary/Beneficiary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public class Beneficiary

private String titleName;

private List<Float> faceEmbedding;

@JsonIgnore

private Title m_title;
Expand Down Expand Up @@ -769,6 +771,23 @@ public Beneficiary(Long BeneficiaryRegID, String BeneficiaryID, String FirstName
this.benPhoneMaps = phoneMap;
}

public Beneficiary(Long BeneficiaryRegID, String BeneficiaryID, String FirstName, String MiddleName,
String LastName, Gender m_gender, Timestamp DOB, List<Float> faceEmbedding) {
this.beneficiaryRegID = BeneficiaryRegID;
this.beneficiaryID = BeneficiaryID;
this.firstName = FirstName;
this.middleName = MiddleName;
this.lastName = LastName;
this.m_gender = m_gender;
this.dOB = DOB;
if (DOB != null) {
this.age = Integer
.parseInt(formatYear.format(new Date(Calendar.getInstance().getTime().getTime() - DOB.getTime())))
- START_YEAR_1970;
}
this.faceEmbedding = faceEmbedding;
}

public Beneficiary(Long BeneficiaryRegID, String BeneficiaryID, String FirstName, String MiddleName,
String LastName, Gender m_gender, Timestamp DOB)
{
Expand Down Expand Up @@ -903,3 +922,4 @@ public Beneficiary()
// }

}

5 changes: 5 additions & 0 deletions src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
private Boolean isD2D;

// END OF new column added for data sync
// new column added for face recognition
@Expose
private List<Float> faceEmbedding;
// END OF new column added for face recognition

// ABHA address
List<AbhaAddressDTO> abhaDetails;
Expand Down Expand Up @@ -376,3 +380,4 @@ public int compareTo(BeneficiaryModel ben) {
return this.beneficiaryRegID.compareTo(ben.beneficiaryRegID);
}
}