Skip to content

H
HIMSScannerService
Commit e89870e9 authored by Krishna Reddy Tamatam's avatar Krishna Reddy Tamatam
Browse files
Options

FOr v2.0 host

parent a51e4ea1
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 32 deletions
Controllers/FTPManagementAPIController.cs
View file @ e89870e9
......@@ -51,6 +51,23 @@ namespace FTP_Services.Services.Controllers
}
}
[HttpGet("GetSearchedHistoryPatients")]
public IActionResult GetSearchedHistoryPatients(string SearchText, int ProviderId, int LocationId, int DateType, string StartDate, string EndDate)
{
log.Debug("GetSearchedPatients ==> ");
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
// List<SearchPatients>? RequestsList = adapter.SearchedPatientsData(SearchText);
List<object>? RequestsList = adapter.SearchedPatientsHistoryData(SearchText, ProviderId, LocationId, DateType, StartDate, EndDate);
return Ok(RequestsList);
}
catch (Exception ex)
{
log.Error("Fail to get data for search patients - Error:" + ex.Message);
return NotFound("No results");
}
}
[HttpGet("GetSearchedPatients")]
public IActionResult GetSearchedPatients(string SearchText, int ProviderId, int LocationId, int DateType, string StartDate, string EndDate, int DischType)
{
......@@ -69,6 +86,23 @@ namespace FTP_Services.Services.Controllers
}
}
[HttpGet("GetAdmissionDataHistory")]
public IActionResult GetAdmissionDataHistory(int PatientID, int LocationID, int ProviderID, int DateType, string StartDate, string EndDate)
{
log.Debug("GetAdmissionDataHistory ==> ");
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
List<object>? RequestsList = adapter.GetAdmissionDataHistory(PatientID, LocationID, ProviderID, DateType, StartDate, EndDate);
return Ok(RequestsList);
}
catch (Exception ex)
{
log.Error("Fail to get data for GetAdmissionDataHistory - Error:" + ex.Message);
return NotFound("No results");
}
}
[HttpGet("GetAdmissionData")]
public IActionResult GetAdmissionData(int PatientID, int LocationID, int ProviderID, int DateType, string StartDate, string EndDate, int DischType)
{
......@@ -86,35 +120,35 @@ namespace FTP_Services.Services.Controllers
}
}
[HttpGet("LoadPhysicians")]
public IActionResult GetLoadPhysicians(int LocationId)
public IActionResult GetLoadPhysicians(int LocationId,Boolean IsOldData)
{
log.Debug("LoadPhysicians ==> ");
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
List<object>? RequestsList = adapter.GeLoadPhysicians(LocationId);
List<object>? RequestsList = adapter.GeLoadPhysicians(LocationId,IsOldData);
return Ok(RequestsList);
}
catch (Exception ex)
{
log.Error("Fail to get data for Admissions - Error:" + ex.Message);
log.Error("Fail to get data for GetLoadPhysicians - Error:" + ex.Message);
return NotFound("No results");
}
}
[HttpGet("GetLocations")]
public IActionResult GetLocations(Boolean IsLoadAll) //int LocationId,
public IActionResult GetLocations(Boolean IsLoadAll,Boolean IsOldData) //int LocationId,
{
log.Debug("GetLocations ==> ");
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
List<object>? RequestsList = adapter.LoadLocations(IsLoadAll);//LocationId,
List<object>? RequestsList = adapter.LoadLocations(IsLoadAll,IsOldData);//LocationId,
return Ok(RequestsList);
}
catch (Exception ex)
{
log.Error("Fail to get data for search patients - Error:" + ex.Message);
log.Error("Fail to get data for GetLocations - Error:" + ex.Message);
return NotFound("No results");
}
}
......@@ -272,13 +306,13 @@ namespace FTP_Services.Services.Controllers
}
[HttpGet("GetPatientDocuments")]
public IActionResult GetPatientDocuments(int SPatientID, int SLocationID,int SAppointmentID,int SAdmissionID,int SDocID,string SDueFrom,string SDueTO)
public IActionResult GetPatientDocuments(int SPatientID, int SLocationID, int SAppointmentID, int SAdmissionID, int SDocID, string SDueFrom, string SDueTO)
{
log.Debug("GetPatientDocuments ==> ");
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
List<object>? RequestsList = adapter.PatientDocuments(SPatientID, SLocationID,SAppointmentID,SAdmissionID,SDocID, SDueFrom, SDueTO);
List<object>? RequestsList = adapter.PatientDocuments(SPatientID, SLocationID, SAppointmentID, SAdmissionID, SDocID, SDueFrom, SDueTO);
return Ok(RequestsList);
}
catch (Exception ex)
......@@ -305,13 +339,13 @@ namespace FTP_Services.Services.Controllers
}
}
[HttpGet("GetAdmissionDischargeData")]
public IActionResult GetAdmissionDischargeData(int SndAdmissionID)
public IActionResult GetAdmissionDischargeData(int SndAdmissionID,int SndIsOldData)
{
log.Debug("GetPatientAdmissions ==> ");
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
List<object>? RequestsList = adapter.AdmissionDischargeData(SndAdmissionID);
List<object>? RequestsList = adapter.AdmissionDischargeData(SndAdmissionID,SndIsOldData);
return Ok(RequestsList);
}
catch (Exception ex)
......@@ -338,13 +372,13 @@ namespace FTP_Services.Services.Controllers
// }
[HttpPost("UpdateImageCategory")]
public int UpdateImageCategory(int sndPatDocId,int sndDocTypeId,int sndUserID)
public int UpdateImageCategory(int sndPatDocId, int sndDocTypeId, int sndUserID)
{
int savedCount = 0;
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
savedCount = adapter.UpdateImageCategory(sndPatDocId,sndDocTypeId,sndUserID);
savedCount = adapter.UpdateImageCategory(sndPatDocId, sndDocTypeId, sndUserID);
}
catch (Exception ex)
{
......@@ -354,7 +388,7 @@ namespace FTP_Services.Services.Controllers
}
[HttpPost("UpdateImageSortNo")]
public int UpdateImageSortNo ([FromBody] PatientImgDocSort PatImgDoc)
public int UpdateImageSortNo([FromBody] PatientImgDocSort PatImgDoc)
{
int savedCount = 0;
try
......@@ -567,14 +601,14 @@ namespace FTP_Services.Services.Controllers
// }
[HttpPost("DeletePatientDocument")]
public string DeletePatientDocument(int DocumentID, int UserID)
public string DeletePatientDocument(int AdmissionId, int DocumentID, int UserID,int SndIsOldData)
{
log.Debug("DeletePatientDocument ==> ");
string DeletePT = "";
try
{
FTPDataAdapter adapter = new FTPDataAdapter(_appSettings);
DeletePT = adapter.DeletePatientDocumentData(DocumentID, UserID);
DeletePT = adapter.DeletePatientDocumentData(AdmissionId, DocumentID, UserID,SndIsOldData);
}
catch (Exception ex)
{
......
Models/FTPInfo.cs
View file @ e89870e9
......@@ -16,7 +16,7 @@ namespace FTP_Services.Core.Models
public string UploadedDate { get; set; }
public int AdmissionID { get; set; }
public int SortNo { get; set; }
public int IsOldData{get; set; }
public PatientDocumentDetailsModel()
{
......@@ -33,7 +33,8 @@ namespace FTP_Services.Core.Models
PatDocId = 0;
UploadedDate = "";
AdmissionID = 0;
SortNo =1;
SortNo = 1;
IsOldData = 1;
}
}
......@@ -271,6 +272,8 @@ namespace FTP_Services.Core.Models
public List<ProcedureModel> Procedures { get; set; }
public string Diagnosis { get; set; }
public string MRD_OtherProcedures { get; set; }
public int IsOldData { get; set; }
}
// Supporting Models
......
Program.cs
View file @ e89870e9
......@@ -138,7 +138,7 @@ if (app.Environment.IsDevelopment())
}
else
{
app.Run(); //For Test Site
//app.Run(); //For Test Site
app.Run("http://*:4708"); // For Production
//app.Run("http://*:4709"); // For Admin
......
Services/FTPDataAdapter.cs
View file @ e89870e9
......@@ -252,7 +252,7 @@ namespace FTP_Services.Services
}
public List<object>? GeLoadPhysicians(int sndLocationId)
public List<object>? GeLoadPhysicians(int sndLocationId,Boolean sndIsOldData)
{
List<object>? PhysiciansData = null;
try
......@@ -260,10 +260,10 @@ namespace FTP_Services.Services
using (var tx = _repository.GetTransaction())
{
string sqlQuery =
$"SELECT * FROM \"SPScanTool_LoadPhysicians\"(@Parm_LocationId)";
$"SELECT * FROM \"SPScanTool_LoadPhysicians\"(@Parm_LocationId,@Param_IsOldData)";
PhysiciansData = _repository.Fetch<object>(
sqlQuery,
new { Parm_LocationId = sndLocationId }
new { Parm_LocationId = sndLocationId,Param_IsOldData = sndIsOldData }
);
GC.Collect();
tx.Complete();
......@@ -275,6 +275,40 @@ namespace FTP_Services.Services
log.Error("GeLoadPhysicians->Failed to get info from db - " + ex.Message);
return null;
}
}
public List<object>? GetAdmissionDataHistory(int PatientID, int LocationID, int ProviderID, int DateType, string StartDate, string EndDate)
{
List<object>? AdmissionDataHistory = null;
try
{
using (var tx = _repository.GetTransaction())
{
string sqlQuery =
$"SELECT * FROM \"SPScanTool_GetAdmissionData_History\"(@Parm_PatientId,@Parm_LocationId,@Parm_ProviderID,@Parm_DateType,@Parm_StartDate,@Parm_EndDate)";
AdmissionDataHistory = _repository.Fetch<object>(
sqlQuery,
new
{
Parm_PatientId = PatientID,
Parm_LocationId = LocationID,
Parm_ProviderID = ProviderID, // Notice the case change here
Parm_DateType = DateType,
Parm_StartDate = StartDate,
Parm_EndDate = EndDate
}
);
GC.Collect();
tx.Complete();
}
return AdmissionDataHistory;
}
catch (Exception ex)
{
log.Error("GetAdmissionData->Failed to get info from db - " + ex.Message);
return null;
}
}
public List<object>? GetAdmissionData(int PatientID, int LocationID, int ProviderID, int DateType, string StartDate, string EndDate, int DischType)
{
......@@ -311,6 +345,35 @@ namespace FTP_Services.Services
return null;
}
}
public List<object>? SearchedPatientsHistoryData(string SearchText, int ProviderId, int LocationId, int DateType, string StartDate, string EndDate)
{
List<object>? SearchedPatientsHistoryData = null;
try
{
using (var tx = _repository.GetTransaction())
{
string searchTextParam = string.IsNullOrEmpty(SearchText)
? "''"
: SearchText.Replace("'", "''");
string sqlQuery =
$"SELECT * FROM \"SPScanTool_GetSearchedPatients_History\"(@Parm_SearchText,@parm_ProviderId,@parm_LocationId,@parm_DateType,@parm_StartDate,@parm_EndDate)";
SearchedPatientsHistoryData = _repository.Fetch<object>(
sqlQuery,
new { Parm_SearchText = SearchText, parm_ProviderId = ProviderId, parm_LocationId = LocationId, parm_DateType = DateType, parm_StartDate = StartDate, parm_EndDate = EndDate}
);
GC.Collect();
tx.Complete();
}
return SearchedPatientsHistoryData;
}
catch (Exception ex)
{
log.Error("SearchedPatientsData->Failed to get info from db - " + ex.Message);
return null;
}
}
public List<object>? SearchedPatientsData(string SearchText, int ProviderId, int LocationId, int DateType, string StartDate, string EndDate, int DischType)
{
......@@ -342,7 +405,7 @@ namespace FTP_Services.Services
}
}
public List<object>? LoadLocations(Boolean IsLoadAll)//int LocationId,
public List<object>? LoadLocations(Boolean IsLoadAll,Boolean IsOldData)//int LocationId,
{
List<object>? LoadLocationsData = null;
try
......@@ -351,10 +414,10 @@ namespace FTP_Services.Services
{
string sqlQuery =
$"SELECT * FROM \"SPScanTool_LoadLocations\"(@Parm_LoadAll)";
$"SELECT * FROM \"SPScanTool_LoadLocations\"(@Parm_LoadAll,@Param_IsOldData)";
LoadLocationsData = _repository.Fetch<object>(
sqlQuery,
new { Parm_LoadAll = IsLoadAll } //Parm_LocationId = LocationId,
new { Parm_LoadAll = IsLoadAll,Param_IsOldData =IsOldData } //Parm_LocationId = LocationId,
);
GC.Collect();
tx.Complete();
......@@ -562,7 +625,7 @@ namespace FTP_Services.Services
}
}
public List<object>? AdmissionDischargeData(int SndAdmissionId)
public List<object>? AdmissionDischargeData(int SndAdmissionId,int SndIsOldData)
{
List<object>? AdmissionDischargeData = null;
try
......@@ -571,10 +634,10 @@ namespace FTP_Services.Services
{
string sqlQuery =
$"SELECT * FROM \"SPScanTool_GetAdmissionDischargeData\"(@Parm_AdmissionId)";
$"SELECT * FROM \"SPScanTool_GetAdmissionDischargeData\"(@Parm_AdmissionId,@Parm_IsOldData)";
AdmissionDischargeData = _repository.Fetch<object>(
sqlQuery,
new { Parm_AdmissionId = SndAdmissionId }
new { Parm_AdmissionId = SndAdmissionId,Parm_IsOldData = SndIsOldData }
);
GC.Collect();
tx.Complete();
......@@ -597,7 +660,7 @@ namespace FTP_Services.Services
string SQLStr = "SELECT public.\"SPScanTool_SaveAdmissionDischargeData\"(@MRDId, @PatientId, @AdmissionId, @ProviderId, " +
"@LocationId, @DepartmentId, @AdmissionAge, @AdmissionDate, @AdmissionTypeId, @DischargeDate, " +
"@DischargeType, @Cause, @UserId, @IsWardChanged, @IsICDChanged, @IsProcChanged, " +
"@Wards::jsonb, @ICDCodes::jsonb, @Procedures::jsonb, @MRD_Diagnosis,@MRD_OtherProcedures)"; // Explicitly cast JSON to jsonb @MRD_Diagnosis::jsonb
"@Wards::jsonb, @ICDCodes::jsonb, @Procedures::jsonb, @MRD_Diagnosis,@MRD_OtherProcedures,@Parm_IsOldData)"; // Explicitly cast JSON to jsonb @MRD_Diagnosis::jsonb
foreach (var model in models)
{
......@@ -625,6 +688,7 @@ namespace FTP_Services.Services
Procedures = model.Procedures != null ? JsonConvert.SerializeObject(model.Procedures) : (object)DBNull.Value,
MRD_Diagnosis = string.IsNullOrEmpty(model.Diagnosis) ? (object)DBNull.Value : model.Diagnosis.ToString(),
MRD_OtherProcedures = string.IsNullOrEmpty(model.MRD_OtherProcedures) ? (object)DBNull.Value : model.MRD_OtherProcedures.ToString(),
Parm_IsOldData = model.IsOldData
};
savedCount += _repository.Single<int>(SQLStr, parameters);
......@@ -656,7 +720,7 @@ namespace FTP_Services.Services
foreach (var doc in patientDocs)
{
string SQLStr = "SELECT * FROM \"SPScanTool_SavePatientDocument\"(@PatDocId, @UploadedDate, @PatientId, @UploadedBy, " +
"@DocumentName, @DocumentType, @ContentType, @Size, @Description, @DocumentUrl, @ThumbnailUrl,@SortNo, @SplID, @AdmissionID)";
"@DocumentName, @DocumentType, @ContentType, @Size, @Description, @DocumentUrl, @ThumbnailUrl,@SortNo, @SplID, @AdmissionID,@Parm_IsOldData)";
var parameters = new
{
......@@ -673,7 +737,8 @@ namespace FTP_Services.Services
ThumbnailUrl = doc.ThumbnailUrl,
SortNo = doc.SortNo,
SplID = doc.SplID,
AdmissionID = doc.AdmissionID
AdmissionID = doc.AdmissionID,
Parm_IsOldData =doc.IsOldData
};
_repository.Single<int>(SQLStr, parameters);
......@@ -816,7 +881,7 @@ namespace FTP_Services.Services
// return _Delete;
// }
public string DeletePatientDocumentData(int SndPatDocRecID, int SndUserID)
public string DeletePatientDocumentData(int SndAdmissionId,int SndPatDocRecID, int SndUserID,int SndIsOldData)
{
string result = string.Empty;
try
......@@ -825,7 +890,7 @@ namespace FTP_Services.Services
{
string SQLStr =
"SELECT * FROM \"SPScanTool_DeletePatientDocument\"("
+ SndPatDocRecID + ',' + SndUserID
+ SndAdmissionId + ',' + SndPatDocRecID + ',' + SndUserID + ','+ SndIsOldData
+ ");";
result = _repository.Single<string>(SQLStr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment