Skip to content

Commit 7ecddea

Browse files
snehar-nd5Amogh
andauthored
Added the CreatedBy and created Date field in to the responce of PrintData. (#96)
* Update version in pom.xml to 3.4.0 * story: amm-1668 task - 1754 * story: amm-1668 task - 1754 dto updated (#92) * story: amm-1668 task - 1754 dto updated (#93) * story: amm-1668 task - 1754 dto updated * story: amm-1668 task - 1754 * fix: amm-1879 doctor signature was not coming for ncdcare --------- Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com>
2 parents cf9f71c + 784f42f commit 7ecddea

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/main/java/com/iemr/tm/data/ncdcare/NCDCareDiagnosis.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public void setNcdScreeningConditionOther(String ncdScreeningConditionOther) {
379379

380380
public NCDCareDiagnosis(Long beneficiaryRegID, Long benVisitID, Integer providerServiceMapID, Long prescriptionID,
381381
String ncdCareCondition, String ncdComplication, String ncdCareType, Long visitCode,
382-
String externalInvestigation, String ncdCareConditionOther) {
382+
String externalInvestigation, String ncdCareConditionOther, String createdBy, Timestamp createdDate) {
383383
super();
384384
this.beneficiaryRegID = beneficiaryRegID;
385385
this.benVisitID = benVisitID;
@@ -391,14 +391,17 @@ public NCDCareDiagnosis(Long beneficiaryRegID, Long benVisitID, Integer provider
391391
this.visitCode = visitCode;
392392
this.externalInvestigation = externalInvestigation;
393393
this.ncdScreeningConditionOther = ncdCareConditionOther;
394+
this.createdBy = createdBy;
395+
this.createdDate = createdDate;
394396
}
395397

396398
public static NCDCareDiagnosis getNCDCareDiagnosisDetails(ArrayList<Object[]> resList) {
397399
NCDCareDiagnosis cOBJ = null;
398400
if (null != resList && resList.size() > 0) {
399401
Object[] obj = resList.get(0);
400402
cOBJ = new NCDCareDiagnosis((Long) obj[0], (Long) obj[1], (Integer) obj[2], (Long) obj[3], (String) obj[4],
401-
(String) obj[5], (String) obj[6], (Long) obj[7], null, (String) obj[8]);
403+
(String) obj[5], (String) obj[6], (Long) obj[7], null, (String) obj[8], (String) obj[9],
404+
(Timestamp) obj[10]);
402405

403406
}
404407
return cOBJ;

src/main/java/com/iemr/tm/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
public interface NCDCareDiagnosisRepo extends CrudRepository<NCDCareDiagnosis, Long> {
4040

4141
@Query(" SELECT beneficiaryRegID, benVisitID, providerServiceMapID, prescriptionID, "
42-
+ " ncdScreeningCondition, ncdComplication, ncdCareType, visitCode, ncdScreeningConditionOther "
42+
+ " ncdScreeningCondition, ncdComplication, ncdCareType, visitCode, ncdScreeningConditionOther, createdBy, createdDate "
4343
+ " from NCDCareDiagnosis ba " + " WHERE ba.beneficiaryRegID = :benRegID"
4444
+ " AND ba.visitCode = :visitCode AND ba.deleted = false " + " ORDER BY createdDate desc")
4545
public ArrayList<Object[]> getNCDCareDiagnosisDetails(@Param("benRegID") Long benRegID,

0 commit comments

Comments
 (0)