Skip to content

Release 3.4.1 #108

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
5Amogh merged 7 commits into from
Dec 3, 2025
Merged

Release 3.4.1 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
784f42f
fix: amm-1879 doctor signature was not coming for ncdcare
snehar-nd Oct 6, 2025
7ecddea
Added the CreatedBy and created Date field in to the responce of Prin…
snehar-nd Oct 7, 2025
3cecdb8
fix: aam-1896 prescribed quantity was not coming in the casesheet
snehar-nd Oct 14, 2025
2806427
Merge pull request #99 from PSMRI/sn/3.5.1
snehar-nd Oct 14, 2025
cfcaba1
Update pom.xml
snehar-nd Oct 15, 2025
f3df470
fix: amm-1919 fix for update doctor data for higher refferal data
snehar-nd Oct 31, 2025
0068d0e
Merge pull request #100 from PSMRI/sn/3.5.1
snehar-nd Oct 31, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.iemr.tm</groupId>
<artifactId>tm-api</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<packaging>war</packaging>

<name>TM-API</name>
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/iemr/tm/data/ncdcare/NCDCareDiagnosis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ public void setNcdScreeningConditionOther(String ncdScreeningConditionOther) {

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 @@ -391,14 +391,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/tm/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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
11 changes: 6 additions & 5 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 @@ -676,11 +676,12 @@ public Long updateBenReferDetails(JsonObject referObj) throws IEMRException {
referDetailsList.add(referDetailsTemp);
}
}
} /*
* else { if (referDetails.getReferredToInstituteName() != null ||
* referDetails.getRevisitDate() != null || referDetails.getReferralReason() !=
* null) referDetailsList.add(referDetails); }
*/
} else {
if (referDetails.getReferredToInstituteName() != null ||
referDetails.getRevisitDate() != null || referDetails.getReferralReason() != null) {
referDetailsList.add(referDetails);
}
}

ArrayList<BenReferDetails> res = (ArrayList<BenReferDetails>) benReferDetailsRepo.saveAll(referDetailsList);
if (referDetailsList.size() == res.size()) {
Expand Down
18 changes: 12 additions & 6 deletions src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2906,7 +2906,8 @@ else if (durationUnit.equalsIgnoreCase("Month(s)"))
private double getQtyForOneDay(String form, String dose, String frequency) {
double qtyInOneDay = 0;
if (form != null && dose != null && frequency != null) {
if (frequency.equalsIgnoreCase("Once Daily(OD)")) {
if (frequency.equalsIgnoreCase("Once Daily(OD)") || frequency.equalsIgnoreCase("Once Daily(OD) Before Food")||
frequency.equalsIgnoreCase("Once Daily(OD) After Food")|| frequency.equalsIgnoreCase("Once Daily(OD) At Bedtime")) {
if (form.equalsIgnoreCase("Tablet")) {
if (dose.equalsIgnoreCase("Half Tab")) {
qtyInOneDay = .5;
Expand All @@ -2930,7 +2931,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
}
}
} else {
if (frequency.equalsIgnoreCase("Twice Daily(BD)")) {
if (frequency.equalsIgnoreCase("Twice Daily(BD)") || frequency.equalsIgnoreCase("Twice Daily(BD) Before Food")||
frequency.equalsIgnoreCase("Twice Daily(BD) After Food")) {
if (form.equalsIgnoreCase("Tablet")) {
if (dose.equalsIgnoreCase("Half Tab")) {
qtyInOneDay = 1;
Expand All @@ -2954,7 +2956,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
}
}
} else {
if (frequency.equalsIgnoreCase("Thrice Daily (TID)")) {
if (frequency.equalsIgnoreCase("Thrice Daily (TID)") || frequency.equalsIgnoreCase("Thrice Daily (TID) After Food")||
frequency.equalsIgnoreCase("Thrice Daily (TID) Before Food")) {
if (form.equalsIgnoreCase("Tablet")) {
if (dose.equalsIgnoreCase("Half Tab")) {
qtyInOneDay = 1.5;
Expand All @@ -2978,7 +2981,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
}
}
} else {
if (frequency.equalsIgnoreCase("Four Times in a Day (QID)")) {
if (frequency.equalsIgnoreCase("Four Times in a Day (QID)") || frequency.equalsIgnoreCase("Four Times in a Day AF")||
frequency.equalsIgnoreCase("Four Times in a Day BF")) {
if (form.equalsIgnoreCase("Tablet")) {
if (dose.equalsIgnoreCase("Half Tab")) {
qtyInOneDay = 2;
Expand All @@ -3002,7 +3006,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
}
}
} else {
if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")) {
if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")||
frequency.equalsIgnoreCase("Single Dose Before Food") || frequency.equalsIgnoreCase("Single Dose After Food")) {
if (form.equalsIgnoreCase("Tablet")) {
if (dose.equalsIgnoreCase("Half Tab")) {
qtyInOneDay = .5;
Expand All @@ -3026,7 +3031,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
}
}
} else {
if (frequency.equalsIgnoreCase("Once in a Week")) {
if (frequency.equalsIgnoreCase("Once in a Week") || frequency.equalsIgnoreCase("Once in a Week After Food")
|| frequency.equalsIgnoreCase("Once in a Week Before Food")) {
if (form.equalsIgnoreCase("Tablet")) {
if (dose.equalsIgnoreCase("Half Tab")) {
qtyInOneDay = .07142;
Expand Down
Loading