Skip to content

Commit 0889338

Browse files
5Amogh5Amogh
authored
Merge branch 'release-3.6.0' into release-3.6.1
2 parents 2e76160 + ddc905f commit 0889338

File tree

17 files changed

+172
-71
lines changed

17 files changed

+172
-71
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.iemr.tm</groupId>
88
<artifactId>tm-api</artifactId>
9-
<version>3.6.1</version>
9+
<version>3.6.0</version>
1010
<packaging>war</packaging>
1111

1212
<name>TM-API</name>

‎src/main/java/com/iemr/tm/data/benFlowStatus/BeneficiaryFlowStatus.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,11 @@ public class BeneficiaryFlowStatus {
295295
@Expose
296296
@Column(name = "referred_visit_id")
297297
private Long referred_visit_id;
298-
298+
299+
@Expose
300+
@Column(name = "doctor_signature_flag")
301+
private Boolean doctorSignatureFlag = false;
302+
299303
@Transient
300304
private I_bendemographics i_bendemographics;
301305
@Transient
@@ -374,6 +378,9 @@ public static BeneficiaryFlowStatus getBeneficiaryFlowStatusForLeftPanel(ArrayLi
374378
(String) objArr[11], (String) objArr[12], (String) objArr[13], (Long) objArr[14],
375379
(Timestamp) objArr[15], (Timestamp) objArr[16], (Long) objArr[17], (Timestamp) objArr[18],
376380
(String) objArr[19], (String) objArr[20]);
381+
if (objArr.length > 21) {
382+
obj.setDoctorSignatureFlag((Boolean) objArr[21]);
383+
}
377384
}
378385
}
379386
return obj;
@@ -991,9 +998,12 @@ public Long getReferred_visit_id() {
991998
public void setReferred_visit_id(Long referred_visit_id) {
992999
this.referred_visit_id = referred_visit_id;
9931000
}
994-
995-
996-
997-
1001+
public Boolean getDoctorSignatureFlag() {
1002+
return doctorSignatureFlag;
1003+
}
1004+
1005+
public void setDoctorSignatureFlag(Boolean doctorSignatureFlag) {
1006+
this.doctorSignatureFlag = doctorSignatureFlag;
1007+
}
9981008

9991009
}

‎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/benFlowStatus/BeneficiaryFlowStatusRepo.java‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public int updateBenFlowStatusAfterNurseActivityANC(@Param("benFlowID") Long ben
118118

119119
@Query("SELECT t.benFlowID, t.beneficiaryRegID, t.visitDate, t.benName, t.age, t.ben_age_val, t.genderID, t.genderName, "
120120
+ " t.villageName, t.districtName, t.beneficiaryID, t.servicePointName, t.VisitReason, t.VisitCategory, t.benVisitID, "
121-
+ " t.registrationDate, t.benVisitDate, t.visitCode, t.consultationDate, t.fatherName, t.preferredPhoneNum FROM BeneficiaryFlowStatus t "
121+
+ " t.registrationDate, t.benVisitDate, t.visitCode, t.consultationDate, t.fatherName, t.preferredPhoneNum, t.doctorSignatureFlag FROM BeneficiaryFlowStatus t "
122122
+ " Where t.beneficiaryRegID = :benRegID AND t.benFlowID = :benFlowID ")
123123
public ArrayList<Object[]> getBenDetailsForLeftSidePanel(@Param("benRegID") Long benRegID,
124124
@Param("benFlowID") Long benFlowID);
@@ -204,17 +204,18 @@ public ArrayList<BeneficiaryFlowStatus> getLabWorklistNew(
204204
*updating lab technician flag as well after feto sense.
205205
*/
206206
@Transactional
207-
@Modifying
207+
@Modifying
208208
@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag , t.pharmacist_flag = :pharmaFlag, "
209209
+ " t.oncologist_flag = :oncologistFlag, t.consultationDate = now(), t.processed = 'U', "
210210
+ " t.specialist_flag = :tcSpecialistFlag, t.tCSpecialistUserID = :tcSpecialistUserID, "
211-
+ "t.tCRequestDate = :tcDate, t.lab_technician_flag = :labTechnicianFlag "
211+
+ "t.tCRequestDate = :tcDate, t.lab_technician_flag = :labTechnicianFlag, t.doctorSignatureFlag = :signatureFlag "
212212
+ " WHERE t.benFlowID = :benFlowID AND " + " t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
213213
public int updateBenFlowStatusAfterDoctorActivity(@Param("benFlowID") Long benFlowID,
214214
@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("docFlag") Short docFlag,
215215
@Param("pharmaFlag") Short pharmaFlag, @Param("oncologistFlag") Short oncologistFlag,
216216
@Param("tcSpecialistFlag") Short tcSpecialistFlag, @Param("tcSpecialistUserID") int tcSpecialistUserID,
217-
@Param("tcDate") Timestamp tcDate,@Param("labTechnicianFlag") Short labTechnicianFlag);
217+
@Param("tcDate") Timestamp tcDate,@Param("labTechnicianFlag") Short labTechnicianFlag,
218+
@Param("signatureFlag") Boolean signatureFlag);
218219

219220
/***
220221
* @author DU20091017
@@ -224,12 +225,12 @@ public int updateBenFlowStatusAfterDoctorActivity(@Param("benFlowID") Long benFl
224225
@Modifying
225226
@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag , t.pharmacist_flag = :pharmaFlag, "
226227
+ " t.oncologist_flag = :oncologistFlag, t.consultationDate = now(), t.processed = 'U', "
227-
+ " t.specialist_flag = :tcSpecialistFlag , t.lab_technician_flag = :labTechnicianFlag "
228+
+ " t.specialist_flag = :tcSpecialistFlag , t.lab_technician_flag = :labTechnicianFlag, t.doctorSignatureFlag = :signatureFlag "
228229
+ " WHERE t.benFlowID = :benFlowID AND t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
229230
public int updateBenFlowStatusAfterDoctorActivitySpecialist(@Param("benFlowID") Long benFlowID,
230231
@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("docFlag") Short docFlag,
231232
@Param("pharmaFlag") Short pharmaFlag, @Param("oncologistFlag") Short oncologistFlag,
232-
@Param("tcSpecialistFlag") Short tcSpecialistFlag,@Param("labTechnicianFlag") Short labTechnicianFlag);
233+
@Param("tcSpecialistFlag") Short tcSpecialistFlag,@Param("labTechnicianFlag") Short labTechnicianFlag, @Param("signatureFlag") Boolean signatureFlag);
233234

234235
/***
235236
* @author DU20091017
@@ -239,12 +240,12 @@ public int updateBenFlowStatusAfterDoctorActivitySpecialist(@Param("benFlowID")
239240
@Modifying
240241
@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag , t.pharmacist_flag = :pharmaFlag, "
241242
+ " t.oncologist_flag = :oncologistFlag, t.consultationDate = now(), t.processed = 'U', "
242-
+ " t.specialist_flag = :tcSpecialistFlag , t.lab_technician_flag = :labTechnicianFlag "
243+
+ " t.specialist_flag = :tcSpecialistFlag , t.lab_technician_flag = :labTechnicianFlag, t.doctorSignatureFlag = :signatureFlag"
243244
+ " WHERE t.benFlowID = :benFlowID AND t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
244245
public int updateBenFlowStatusAfterDoctorActivitySpecialistANC(@Param("benFlowID") Long benFlowID,
245246
@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("docFlag") Short docFlag,
246247
@Param("pharmaFlag") Short pharmaFlag, @Param("oncologistFlag") Short oncologistFlag,
247-
@Param("tcSpecialistFlag") Short tcSpecialistFlag,@Param("labTechnicianFlag") Short labTechnicianFlag);
248+
@Param("tcSpecialistFlag") Short tcSpecialistFlag,@Param("labTechnicianFlag") Short labTechnicianFlag, @Param("signatureFlag") Boolean signatureFlag);
248249

249250
/***
250251
* @author DU20091017
@@ -254,22 +255,24 @@ public int updateBenFlowStatusAfterDoctorActivitySpecialistANC(@Param("benFlowID
254255
@Modifying
255256
@Query("UPDATE BeneficiaryFlowStatus t set t.pharmacist_flag = :pharmaFlag, "
256257
+ " t.oncologist_flag = :oncologistFlag, t.processed = 'U', t.specialist_flag = :tcSpecialistFlag, "
257-
+ "t.lab_technician_flag = :labTechnicianFlag"
258+
+ "t.lab_technician_flag = :labTechnicianFlag, t.doctorSignatureFlag = :signatureFlag"
258259
+ " WHERE t.benFlowID = :benFlowID AND t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
259260
public int updateBenFlowStatusAfterDoctorActivityTCSpecialist(@Param("benFlowID") Long benFlowID,
260261
@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("pharmaFlag") Short pharmaFlag,
261262
@Param("oncologistFlag") Short oncologistFlag, @Param("tcSpecialistFlag") Short tcSpecialistFlag,
262-
@Param("labTechnicianFlag") Short labTechnicianFlag);
263+
@Param("labTechnicianFlag") Short labTechnicianFlag, @Param("signatureFlag") Boolean signatureFlag);
263264

264265
@Transactional
265-
@Modifying
266-
@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag , t.pharmacist_flag = :pharmaFlag, "
267-
+ " t.oncologist_flag = :oncologistFlag , t.processed = 'U' " + " WHERE t.benFlowID = :benFlowID AND "
268-
+ " t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
269-
public int updateBenFlowStatusAfterDoctorActivityUpdate(@Param("benFlowID") Long benFlowID,
270-
@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("docFlag") Short docFlag,
271-
@Param("pharmaFlag") Short pharmaFlag, @Param("oncologistFlag") Short oncologistFlag);
272-
266+
@Modifying
267+
@Query("UPDATE BeneficiaryFlowStatus t set t.doctorFlag = :docFlag , t.pharmacist_flag = :pharmaFlag, "
268+
+ " t.oncologist_flag = :oncologistFlag , t.processed = 'U', t.doctorSignatureFlag = :signatureFlag"
269+
+ " WHERE t.benFlowID = :benFlowID AND "
270+
+ " t.beneficiaryRegID = :benRegID AND t.beneficiaryID = :benID ")
271+
public int updateBenFlowStatusAfterDoctorActivityUpdate(@Param("benFlowID") Long benFlowID,
272+
@Param("benRegID") Long benRegID, @Param("benID") Long benID, @Param("docFlag") Short docFlag,
273+
@Param("pharmaFlag") Short pharmaFlag, @Param("oncologistFlag") Short oncologistFlag,
274+
@Param("signatureFlag") Boolean signatureFlag);
275+
273276
@Query("SELECT t from BeneficiaryFlowStatus t "
274277
+ " WHERE t.benVisitDate >= Date(:fromDate) AND t.vanID = :vanID AND t.radiologist_flag = 1 "
275278
+ " AND t.providerServiceMapId= :providerServiceMapId ORDER BY t.benVisitDate DESC ")

‎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,

‎src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ public Long saveANCDoctorData(JsonObject requestOBJ, String Authorization) throw
350350
Long referSaveSuccessFlag = null;
351351
Integer tcRequestStatusFlag = null;
352352

353+
Boolean doctorSignatureFlag = false;
354+
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
355+
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
356+
}
357+
353358
if (requestOBJ != null) {
354359
TeleconsultationRequestOBJ tcRequestOBJ = null;
355360
// TcSpecialistSlotBookingRequestOBJ tcSpecialistSlotBookingRequestOBJ = null;
@@ -466,7 +471,7 @@ public Long saveANCDoctorData(JsonObject requestOBJ, String Authorization) throw
466471

467472
}
468473
int i = commonDoctorServiceImpl.updateBenFlowtableAfterDocDataSave(commonUtilityClass, isTestPrescribed,
469-
isMedicinePrescribed, tcRequestOBJ);
474+
isMedicinePrescribed, tcRequestOBJ,doctorSignatureFlag);
470475

471476
if (i > 0)
472477
saveSuccessFlag = diagnosisSuccessFlag;
@@ -1488,6 +1493,11 @@ public Long updateANCDoctorData(JsonObject requestOBJ, String Authorization) thr
14881493
Boolean isTestPrescribed = false;
14891494
Boolean isMedicinePrescribed = false;
14901495

1496+
Boolean doctorSignatureFlag = false;
1497+
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
1498+
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
1499+
}
1500+
14911501
// checking if test is prescribed
14921502
if (requestOBJ.has("investigation") && !requestOBJ.get("investigation").isJsonNull()
14931503
&& requestOBJ.get("investigation") != null) {
@@ -1596,7 +1606,7 @@ public Long updateANCDoctorData(JsonObject requestOBJ, String Authorization) thr
15961606

15971607
}
15981608
int i = commonDoctorServiceImpl.updateBenFlowtableAfterDocDataUpdate(commonUtilityClass,
1599-
isTestPrescribed, isMedicinePrescribed, tcRequestOBJ);
1609+
isTestPrescribed, isMedicinePrescribed, tcRequestOBJ, doctorSignatureFlag);
16001610
if (i > 0)
16011611
updateSuccessFlag = investigationSuccessFlag;
16021612
else

‎src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.ArrayList;
2828
import java.util.Calendar;
2929

30+
import org.checkerframework.checker.units.qual.s;
3031
import org.slf4j.Logger;
3132
import org.slf4j.LoggerFactory;
3233
import org.springframework.beans.factory.annotation.Autowired;
@@ -242,35 +243,35 @@ private BeneficiaryFlowStatus getBenFlowRecordObj(String requestOBJ, Long benefi
242243
}
243244

244245
public int updateBenFlowAfterDocData(Long benFlowID, Long benRegID, Long benID, Long benVisitID, short docFlag,
245-
short pharmaFlag, short oncologistFlag, short tcSpecialistFlag, int tcUserID, Timestamp tcDate,short labTechnicianFlag) {
246+
short pharmaFlag, short oncologistFlag, short tcSpecialistFlag, int tcUserID, Timestamp tcDate,short labTechnicianFlag, Boolean signatureFlag) {
246247
int i = 0;
247248
try {
248249
i = beneficiaryFlowStatusRepo.updateBenFlowStatusAfterDoctorActivity(benFlowID, benRegID, benID, docFlag,
249-
pharmaFlag, oncologistFlag, tcSpecialistFlag, tcUserID, tcDate,labTechnicianFlag);
250+
pharmaFlag, oncologistFlag, tcSpecialistFlag, tcUserID, tcDate,labTechnicianFlag, signatureFlag);
250251
} catch (Exception e) {
251252
logger.error("Error in ben flow creation = " + e);
252253
}
253254
return i;
254255
}
255256

256257
public int updateBenFlowAfterDocDataFromSpecialist(Long benFlowID, Long benRegID, Long benID, Long benVisitID,
257-
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag,short labTechnicianFlag) {
258+
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag,short labTechnicianFlag, Boolean signatureFlag) {
258259
int i = 0;
259260
try {
260261
i = beneficiaryFlowStatusRepo.updateBenFlowStatusAfterDoctorActivitySpecialist(benFlowID, benRegID, benID,
261-
docFlag, pharmaFlag, oncologistFlag, tcSpecialistFlag,labTechnicianFlag);
262+
docFlag, pharmaFlag, oncologistFlag, tcSpecialistFlag, labTechnicianFlag, signatureFlag);
262263
} catch (Exception e) {
263264
logger.error("Error in ben flow creation = " + e);
264265
}
265266
return i;
266267
}
267268

268269
public int updateBenFlowAfterDocDataFromSpecialistANC(Long benFlowID, Long benRegID, Long benID, Long benVisitID,
269-
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag,short labTechnicianFlag) {
270+
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag,short labTechnicianFlag, Boolean signatureFlag) {
270271
int i = 0;
271272
try {
272273
i = beneficiaryFlowStatusRepo.updateBenFlowStatusAfterDoctorActivitySpecialistANC(benFlowID, benRegID, benID,
273-
docFlag, pharmaFlag, oncologistFlag, tcSpecialistFlag,labTechnicianFlag);
274+
docFlag, pharmaFlag, oncologistFlag, tcSpecialistFlag, labTechnicianFlag, signatureFlag);
274275
} catch (Exception e) {
275276
logger.error("Error in ben flow creation = " + e);
276277
}
@@ -279,7 +280,7 @@ public int updateBenFlowAfterDocDataFromSpecialistANC(Long benFlowID, Long benRe
279280

280281
public int updateBenFlowAfterDocDataUpdate(Long benFlowID, Long benRegID, Long benID, Long benVisitID,
281282
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag, int tcUserID,
282-
Timestamp tcDate,short labTechnicianFlag) throws Exception {
283+
Timestamp tcDate,short labTechnicianFlag, Boolean signatureFlag) throws Exception {
283284
int i = 0;
284285
try {
285286
Short pharmaF = beneficiaryFlowStatusRepo.getPharmaFlag(benFlowID);
@@ -291,7 +292,7 @@ public int updateBenFlowAfterDocDataUpdate(Long benFlowID, Long benRegID, Long b
291292
pharmaF1 = pharmaFlag;
292293

293294
i = beneficiaryFlowStatusRepo.updateBenFlowStatusAfterDoctorActivity(benFlowID, benRegID, benID, docFlag,
294-
pharmaF1, oncologistFlag, tcSpecialistFlag, tcUserID, tcDate,labTechnicianFlag);
295+
pharmaF1, oncologistFlag, tcSpecialistFlag, tcUserID, tcDate, labTechnicianFlag, signatureFlag);
295296
} catch (Exception e) {
296297
logger.error("Error in ben flow creation = " + e);
297298
throw new Exception(e);
@@ -301,7 +302,7 @@ public int updateBenFlowAfterDocDataUpdate(Long benFlowID, Long benRegID, Long b
301302

302303
public int updateBenFlowAfterDocDataUpdateTCSpecialist(Long benFlowID, Long benRegID, Long benID, Long benVisitID,
303304
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag, int tcUserID,
304-
Timestamp tcDate, short labTechnicianFlag) throws Exception {
305+
Timestamp tcDate, short labTechnicianFlag, Boolean signatureFlag) throws Exception {
305306
int i = 0;
306307
try {
307308
Short pharmaF = beneficiaryFlowStatusRepo.getPharmaFlag(benFlowID);
@@ -313,7 +314,7 @@ public int updateBenFlowAfterDocDataUpdateTCSpecialist(Long benFlowID, Long benR
313314
pharmaF1 = pharmaFlag;
314315

315316
i = beneficiaryFlowStatusRepo.updateBenFlowStatusAfterDoctorActivityTCSpecialist(benFlowID, benRegID, benID,
316-
pharmaF1, oncologistFlag, tcSpecialistFlag,labTechnicianFlag);
317+
pharmaF1, oncologistFlag, tcSpecialistFlag, labTechnicianFlag, signatureFlag);
317318
} catch (Exception e) {
318319
logger.error("Error in ben flow creation = " + e);
319320
throw new Exception(e);

‎src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,12 @@ public Long saveCancerScreeningDoctorData(JsonObject requestOBJ, String Authoriz
811811
Long docDataSuccessFlag = null;
812812
Long tcRequestStatusFlag = null;
813813

814+
Boolean doctorSignatureFlag = false;
815+
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
816+
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
817+
}
818+
819+
814820
if (requestOBJ != null && requestOBJ.has("diagnosis") && !requestOBJ.get("diagnosis").isJsonNull()) {
815821

816822
TeleconsultationRequestOBJ tcRequestOBJ = null;
@@ -907,7 +913,7 @@ public Long saveCancerScreeningDoctorData(JsonObject requestOBJ, String Authoriz
907913
&& commonUtilityClass.getIsSpecialist() == true) {
908914
l1 = commonBenStatusFlowServiceImpl.updateBenFlowAfterDocDataFromSpecialist(tmpBenFlowID,
909915
tmpbeneficiaryRegID, tmpBeneficiaryID, tmpBenVisitID, docFlag, pharmaFalg, oncologistFlag,
910-
tcSpecialistFlag, (short) 0);
916+
tcSpecialistFlag, (short) 0, doctorSignatureFlag);
911917

912918
if (tcSpecialistFlag == 9) {
913919
int l = tCRequestModelRepo.updateStatusIfConsultationCompleted(
@@ -916,7 +922,7 @@ public Long saveCancerScreeningDoctorData(JsonObject requestOBJ, String Authoriz
916922
} else {
917923
l2 = commonBenStatusFlowServiceImpl.updateBenFlowAfterDocData(tmpBenFlowID, tmpbeneficiaryRegID,
918924
tmpBeneficiaryID, tmpBenVisitID, docFlag, pharmaFalg, oncologistFlag, tcSpecialistFlag,
919-
tcUserID, tcDate, (short) 0);
925+
tcUserID, tcDate, (short) 0, doctorSignatureFlag);
920926
}
921927

922928
if (l1 > 0 || l2 > 0)

0 commit comments

Comments
 (0)