PSMRI · 5Amogh · Dec 3, 2025 · Sep 24, 2025 · Sep 25, 2025 · Sep 26, 2025
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.mmu</groupId>
 	<artifactId>mmu-api</artifactId>
-	<version>3.4.0</version>
+	<version>3.4.1</version>
 	<packaging>war</packaging>
 
 	<name>MMU-API</name>

diff --git a/src/main/java/com/iemr/mmu/data/benFlowStatus/BeneficiaryFlowStatus.java b/src/main/java/com/iemr/mmu/data/benFlowStatus/BeneficiaryFlowStatus.java
@@ -274,7 +274,11 @@ public class BeneficiaryFlowStatus {
 	@Expose
 	@Column(name = "isCaseSheetdownloaded")
 	private Boolean isCaseSheetdownloaded;
-
+
+	@Expose
+	@Column(name = "doctor_signature_flag")
+	private Boolean doctorSignatureFlag = false;
+
 	@Transient
 	private I_bendemographics i_bendemographics;
 	@Transient
@@ -368,8 +372,11 @@ public static BeneficiaryFlowStatus getBeneficiaryFlowStatusForLeftPanel(ArrayLi
 						(String) objArr[3], (String) objArr[4], (Integer) objArr[5], (Short) objArr[6],
 						(String) objArr[7], (String) objArr[8], (String) objArr[9], (Long) objArr[10],
 						(String) objArr[11], (String) objArr[12], (String) objArr[13], (Long) objArr[14],
-						(Timestamp) objArr[15], (Timestamp) objArr[16], (Long) objArr[17], (Timestamp) objArr[18], 
+						(Timestamp) objArr[15], (Timestamp) objArr[16], (Long) objArr[17], (Timestamp) objArr[18],
 						(String) objArr[19], (String) objArr[20]);
+				if (objArr.length > 21) {
+					obj.setDoctorSignatureFlag((Boolean) objArr[21]);
+				}
 			}
 		}
 		return obj;
@@ -972,4 +979,14 @@ public void setAuth(String auth) {
 		Auth = auth;
 	}
 
+	// Add getter
+	public Boolean getDoctorSignatureFlag() {
+		return doctorSignatureFlag;
+	}
+
+	// Add setter
+	public void setDoctorSignatureFlag(Boolean doctorSignatureFlag) {
+		this.doctorSignatureFlag = doctorSignatureFlag;
+	}
+
 }
diff --git a/src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java b/src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java
@@ -39,7 +39,6 @@
 import com.google.gson.annotations.Expose;
 import lombok.Data;
 
-import lombok.Data;
 
 @Entity
 @Data

diff --git a/src/main/java/com/iemr/mmu/data/ncdcare/NCDCareDiagnosis.java b/src/main/java/com/iemr/mmu/data/ncdcare/NCDCareDiagnosis.java
@@ -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;
@@ -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;
@@ -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;
@@ -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;

diff --git a/src/main/java/com/iemr/mmu/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java b/src/main/java/com/iemr/mmu/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java
@@ -56,7 +56,7 @@ public ArrayList<BeneficiaryFlowStatus> getNurseWorklistNew(
 			+ " t.VisitCategory = :visitCategory, t.nurseFlag = :nurseFlag, t.doctorFlag = :docFlag, "
 			+ " t.labIteration = :labIteration, t.lab_technician_flag = 0, t.radiologist_flag = :radiologistFlag, "
 			+ " t.oncologist_flag = :oncologistFlag, t.benVisitDate = now(), "
-			+ " t.visitCode = :benVisitCode, t.processed = 'U', t.vanID =:vanID "
+			+ " t.visitCode = :benVisitCode, t.processed = 'U', t.vanID =:vanID, t.vanSerialNo=:benFlowID "
 			+ "  WHERE t.benFlowID = :benFlowID AND t.beneficiaryRegID = :benRegID " + " AND nurseFlag = 1  ")
 	public int updateBenFlowStatusAfterNurseActivity(@Param("benFlowID") Long benFlowID,
 			@Param("benRegID") Long benRegID, @Param("benVisitID") Long benVisitID,
@@ -74,9 +74,12 @@ public int updateBenFlowStatusTMReferred(@Param("benFlowID") Long benFlowID, @Pa
 			@Param("specialistFlag") Short specialistFlag, @Param("pharmacistflag") Short pharmacistflag);
 
 	@Query("SELECT  t.benFlowID, t.beneficiaryRegID, t.visitDate, t.benName, t.age, t.ben_age_val, t.genderID, t.genderName, "
-			+ " t.villageName, t.districtName, t.beneficiaryID, t.servicePointName, t.VisitReason, t.VisitCategory, t.benVisitID,  "
-			+ " t.registrationDate, t.benVisitDate, t.visitCode, t.consultationDate, t.fatherName, t.preferredPhoneNum FROM BeneficiaryFlowStatus t "
-			+ " Where t.beneficiaryRegID = :benRegID AND t.benFlowID = :benFlowID ")
+			+ " t.villageName, t.districtName, t.beneficiaryID, t.servicePointName, t.VisitReason, t.VisitCategory, "
+			+ " t.benVisitID, t.registrationDate, t.benVisitDate, t.visitCode, t.consultationDate, "
+			+ " t.fatherName, t.preferredPhoneNum, t.doctorSignatureFlag " // <-- added here
+			+ " FROM BeneficiaryFlowStatus t "
+			+ " WHERE t.beneficiaryRegID = :benRegID AND t.benFlowID = :benFlowID ")
+
 	public ArrayList<Object[]> getBenDetailsForLeftSidePanel(@Param("benRegID") Long benRegID,
 			@Param("benFlowID") Long benFlowID);
 
@@ -147,37 +150,51 @@ public ArrayList<BeneficiaryFlowStatus> getLabWorklistNew(
 			@Param("providerServiceMapId") Integer providerServiceMapId, @Param("fromDate") Timestamp fromDate,
 			@Param("vanID") Integer vanID);
 
+
 	@Transactional
 	@Modifying
-	@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag , t.pharmacist_flag = :pharmaFlag, "
-			+ " t.oncologist_flag = :oncologistFlag, t.consultationDate = now(), t.processed = 'U', "
-			+ " t.specialist_flag = :tcSpecialistFlag, t.tCSpecialistUserID = :tcSpecialistUserID, t.tCRequestDate = :tcDate "
-			+ " WHERE t.benFlowID = :benFlowID AND " + " t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
+	@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag, "
+			+ "t.pharmacist_flag = :pharmaFlag, t.doctorSignatureFlag = :signatureFlag, "
+			+ "t.oncologist_flag = :oncologistFlag, t.consultationDate = now(), t.processed = 'U', "
+			+ "t.specialist_flag = :tcSpecialistFlag, t.tCSpecialistUserID = :tcSpecialistUserID, "
+			+ "t.tCRequestDate = :tcDate WHERE t.benFlowID = :benFlowID AND "
+			+ "t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID")
 	public int updateBenFlowStatusAfterDoctorActivity(@Param("benFlowID") Long benFlowID,
-			@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("docFlag") Short docFlag,
-			@Param("pharmaFlag") Short pharmaFlag, @Param("oncologistFlag") Short oncologistFlag,
-			@Param("tcSpecialistFlag") Short tcSpecialistFlag, @Param("tcSpecialistUserID") int tcSpecialistUserID,
-			@Param("tcDate") Timestamp tcDate);
-	@Transactional
-	@Modifying
-	@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag , t.pharmacist_flag = :pharmaFlag, "
-			+ " t.oncologist_flag = :oncologistFlag, t.consultationDate = now(), t.processed = 'U', "
-			+ " t.tCSpecialistUserID = :tcSpecialistUserID, t.tCRequestDate = :tcDate "
-			+ " WHERE t.benFlowID = :benFlowID AND " + " t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
-	public int updateBenFlowStatusAfterDoctorActivityWDF(@Param("benFlowID") Long benFlowID,
-			@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("docFlag") Short docFlag,
-			@Param("pharmaFlag") Short pharmaFlag, @Param("oncologistFlag") Short oncologistFlag,
-			 @Param("tcSpecialistUserID") int tcSpecialistUserID,
-			@Param("tcDate") Timestamp tcDate);
+			@Param("benRegID") Long benRegID, @Param("benID") Long benID,
+			@Param("docFlag") Short docFlag, @Param("pharmaFlag") Short pharmaFlag,
+			@Param("oncologistFlag") Short oncologistFlag,
+			@Param("tcSpecialistFlag") Short tcSpecialistFlag,
+			@Param("tcSpecialistUserID") int tcSpecialistUserID,
+			@Param("tcDate") Timestamp tcDate,
+			@Param("signatureFlag") Boolean signatureFlag);
 
 	@Transactional
 	@Modifying
-	@Query("UPDATE BeneficiaryFlowStatus t set t.pharmacist_flag = :pharmaFlag, "
-			+ " t.oncologist_flag = :oncologistFlag, t.processed = 'U', t.specialist_flag = :tcSpecialistFlag "
-			+ " WHERE t.benFlowID = :benFlowID AND  t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
-	public int updateBenFlowStatusAfterDoctorActivityTCSpecialist(@Param("benFlowID") Long benFlowID,
-			@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("pharmaFlag") Short pharmaFlag,
-			@Param("oncologistFlag") Short oncologistFlag, @Param("tcSpecialistFlag") Short tcSpecialistFlag);
+	@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag, "
+			+ "t.pharmacist_flag = :pharmaFlag, t.doctorSignatureFlag = :signatureFlag, "
+			+ "t.oncologist_flag = :oncologistFlag, t.consultationDate = now(), t.processed = 'U', "
+			+ "t.tCSpecialistUserID = :tcSpecialistUserID, t.tCRequestDate = :tcDate "
+			+ "WHERE t.benFlowID = :benFlowID AND t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID")
+	public int updateBenFlowStatusAfterDoctorActivityWDF(@Param("benFlowID") Long benFlowID,
+			@Param("benRegID") Long benRegID, @Param("benID") Long benID,
+			@Param("docFlag") Short docFlag, @Param("pharmaFlag") Short pharmaFlag,
+			@Param("oncologistFlag") Short oncologistFlag,
+			@Param("tcSpecialistUserID") int tcSpecialistUserID,
+			@Param("tcDate") Timestamp tcDate,
+			@Param("signatureFlag") Boolean signatureFlag);
+
+@Transactional  
+@Modifying  
+@Query("UPDATE BeneficiaryFlowStatus t set t.pharmacist_flag = :pharmaFlag, "  
+    + "t.doctorSignatureFlag = :signatureFlag, "  
+    + "t.oncologist_flag = :oncologistFlag, t.processed = 'U', t.specialist_flag = :tcSpecialistFlag "  
+    + "WHERE t.benFlowID = :benFlowID AND t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID")  
+public int updateBenFlowStatusAfterDoctorActivityTCSpecialist(@Param("benFlowID") Long benFlowID,  
+    @Param("benRegID") Long benRegID, @Param("benID") Long benID,  
+    @Param("pharmaFlag") Short pharmaFlag,  
+    @Param("oncologistFlag") Short oncologistFlag,  
+    @Param("tcSpecialistFlag") Short tcSpecialistFlag,  
+    @Param("signatureFlag") Boolean signatureFlag);
 
 	@Transactional
 	@Modifying

diff --git a/src/main/java/com/iemr/mmu/repo/labModule/LabResultEntryRepo.java b/src/main/java/com/iemr/mmu/repo/labModule/LabResultEntryRepo.java
@@ -24,13 +24,16 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.iemr.mmu.data.labModule.LabResultEntry;
 
+import jakarta.transaction.Transactional;
+
 @Repository
 public interface LabResultEntryRepo extends CrudRepository<LabResultEntry, BigInteger> {
 	@Query("SELECT procedureID FROM LabResultEntry WHERE beneficiaryRegID = :benRegID AND "
@@ -46,4 +49,9 @@ ArrayList<Integer> findProcedureListByBeneficiaryRegIDAndBenVisitID(@Param("benR
 	ArrayList<Object[]> getLast_3_visitForLabTestDone(@Param("benRegID") Long benRegID,
 			@Param("visitCode") Long visitCode);
 
+	@Transactional
+	@Modifying
+	@Query(" UPDATE LabResultEntry set vanSerialNo = :ID WHERE ID = :ID")
+	int updateVanSerialNo(@Param("ID") BigInteger ID);
+
 }
diff --git a/src/main/java/com/iemr/mmu/repo/nurse/BenVisitDetailRepo.java b/src/main/java/com/iemr/mmu/repo/nurse/BenVisitDetailRepo.java
@@ -96,4 +96,9 @@ public int updateFileID(@Param("fileIDs") String fileIDs, @Param("regID") Long r
 	@Query("SELECT MAX(bvd.createdDate) from BeneficiaryVisitDetail bvd WHERE bvd.beneficiaryRegID = :benRegID AND bvd.visitReason = :visitreason AND bvd.visitCategory = :visitcategory ")
     public String getMaxCreatedDate(@Param("benRegID") Long benRegID, @Param("visitreason") String visitreason,@Param("visitcategory") String visitcategory);
 
+	@Transactional
+	@Modifying
+	@Query(" UPDATE BeneficiaryVisitDetail set vanSerialNo = :benVisitID WHERE benVisitID = :benVisitID")
+	int updateVanSerialNo(@Param("benVisitID") Long benVisitID);
+
 }
diff --git a/src/main/java/com/iemr/mmu/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java b/src/main/java/com/iemr/mmu/repo/nurse/ncdcare/NCDCareDiagnosisRepo.java
@@ -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,

diff --git a/src/main/java/com/iemr/mmu/repo/quickConsultation/BenChiefComplaintRepo.java b/src/main/java/com/iemr/mmu/repo/quickConsultation/BenChiefComplaintRepo.java
@@ -48,4 +48,8 @@ public ArrayList<Object[]> getBenChiefComplaints(@Param("benRegID") Long benRegI
 	@Query(" Delete from BenChiefComplaint WHERE beneficiaryRegID = :benRegID AND visitCode = :visitCode")
 	public int deleteExistingBenChiefComplaints(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);
 
+	@Transactional
+	@Modifying
+	@Query(" UPDATE BenChiefComplaint set vanSerialNo = :benChiefComplaintID WHERE benChiefComplaintID = :benChiefComplaintID")
+	int updateVanSerialNo(@Param("benChiefComplaintID") Long benChiefComplaintID);
 }
diff --git a/src/main/java/com/iemr/mmu/repo/quickConsultation/LabTestOrderDetailRepo.java b/src/main/java/com/iemr/mmu/repo/quickConsultation/LabTestOrderDetailRepo.java
@@ -47,4 +47,8 @@ public ArrayList<Object[]> getLabTestOrderDetails(@Param("benRegID") Long benReg
 	@Query(" Delete from LabTestOrderDetail WHERE beneficiaryRegID = :benRegID AND benVisitID = :benVisitID ")
 	public int deleteExistingLabTestOrderDetail(@Param("benRegID") Long benRegID, @Param("benVisitID") Long benVisitID);
 
+	@Transactional
+	@Modifying
+	@Query(" UPDATE LabTestOrderDetail set vanSerialNo = :labTestOrderID WHERE labTestOrderID = :labTestOrderID")
+	int updateVanSerialNo(@Param("labTestOrderID") Long labTestOrderID);
 }
diff --git a/src/main/java/com/iemr/mmu/repo/quickConsultation/PrescriptionDetailRepo.java b/src/main/java/com/iemr/mmu/repo/quickConsultation/PrescriptionDetailRepo.java
@@ -83,4 +83,10 @@ public int updatePrescription(@Param("diagnosisProvided") String diagnosisProvid
 			@Param("diagnosisProvided_SCTCode") String diagnosisProvided_SCTCode,
 			@Param("diagnosisProvided_SCTTerm") String diagnosisProvided_SCTTerm);
 
+	@Transactional
+	@Modifying
+	@Query(" UPDATE PrescriptionDetail set vanSerialNo = :prescriptionID WHERE prescriptionID = :prescriptionID")
+	int updateVanSerialNo(@Param("prescriptionID") Long prescriptionID);
+
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ @@
     import com.google.gson.annotations.Expose;
     import lombok.Data;
-    import lombok.Data;
     @Entity
     @Data
@@ Expand Down @@