Skip to content

fix: Doctor signature was not coming in to ncd care visittype #126

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
vishwab1 merged 2 commits into from
Oct 6, 2025
Merged

fix: Doctor signature was not coming in to ncd care visittype #126

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
f1efb4d
fix: Doctor signature was not coming in to ncd care visittype
snehar-nd Oct 6, 2025
5e5e078
fix: add the createby and createat
vishwab1 Oct 6, 2025
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
17 changes: 9 additions & 8 deletions src/main/java/com/iemr/mmu/data/ncdcare/NCDCareDiagnosis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@Table(name = "t_ncddiagnosis")
public class NCDCareDiagnosis {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY )
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Expose
@Column(name = "ID")
private Long ID;
Expand Down Expand Up @@ -142,20 +142,18 @@ public class NCDCareDiagnosis {
@Transient
@Expose
private String externalInvestigation;

@Expose
@Transient
private ArrayList<SCTDescription> provisionalDiagnosisList;

@Expose
@Transient
private String diagnosisProvided;

@Expose
@Transient
private String diagnosisProvided_SCTCode;



public String getDiagnosisProvided() {
return diagnosisProvided;
Expand Down Expand Up @@ -383,7 +381,7 @@ public void setVanID(Integer vanID) {

public NCDCareDiagnosis(Long beneficiaryRegID, Long benVisitID, Integer providerServiceMapID, Long prescriptionID,
String ncdCareCondition, String ncdComplication, String ncdCareType, Long visitCode,
String externalInvestigation, String ncdCareConditionOther) {
String externalInvestigation, String ncdCareConditionOther, String createdBy, Timestamp createdDate) {
super();
this.beneficiaryRegID = beneficiaryRegID;
this.benVisitID = benVisitID;
Expand All @@ -395,14 +393,17 @@ public NCDCareDiagnosis(Long beneficiaryRegID, Long benVisitID, Integer provider
this.visitCode = visitCode;
this.externalInvestigation = externalInvestigation;
this.ncdScreeningConditionOther = ncdCareConditionOther;
this.createdBy = createdBy;
this.createdDate = createdDate;
}

public static NCDCareDiagnosis getNCDCareDiagnosisDetails(ArrayList<Object[]> resList) {
NCDCareDiagnosis cOBJ = null;
if (null != resList && resList.size() > 0) {
Object[] obj = resList.get(0);
cOBJ = new NCDCareDiagnosis((Long) obj[0], (Long) obj[1], (Integer) obj[2], (Long) obj[3], (String) obj[4],
(String) obj[5], (String) obj[6], (Long) obj[7], null, (String) obj[8]);
(String) obj[5], (String) obj[6], (Long) obj[7], null, (String) obj[8], (String) obj[9],
(Timestamp) obj[10]);

}
return cOBJ;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/mmu/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
public interface NCDCareDiagnosisRepo extends CrudRepository<NCDCareDiagnosis, Long> {

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