Commit 1bd0daac authored by Krishna Reddy Tamatam's avatar Krishna Reddy Tamatam

For release v3,0

parent b428c842
This diff is collapsed.
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="ExcelDataReader" Version="3.6.0" /> <PackageReference Include="ExcelDataReader" Version="3.6.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" /> <PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
<PackageReference Include="FluentFTP" Version="53.0.1" />
<PackageReference Include="iTextSharp" Version="5.5.13.4" /> <PackageReference Include="iTextSharp" Version="5.5.13.4" />
<PackageReference Include="log4net" Version="2.0.14" /> <PackageReference Include="log4net" Version="2.0.14" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
......
...@@ -4,6 +4,7 @@ namespace FTP_Services.Core.Models ...@@ -4,6 +4,7 @@ namespace FTP_Services.Core.Models
{ {
public string ConnectionString { get; set; } public string ConnectionString { get; set; }
public string AdminConnectionString { get; set; } public string AdminConnectionString { get; set; }
public string ConnectionString_MRD { get; set; }
public string Secret { get; set; } public string Secret { get; set; }
public AppSettings() public AppSettings()
...@@ -11,6 +12,7 @@ namespace FTP_Services.Core.Models ...@@ -11,6 +12,7 @@ namespace FTP_Services.Core.Models
Secret = ""; Secret = "";
ConnectionString = ""; ConnectionString = "";
AdminConnectionString = ""; AdminConnectionString = "";
ConnectionString_MRD = "";
} }
public FTPConfiguration FTPConfiguration { get; set; } public FTPConfiguration FTPConfiguration { get; set; }
......
namespace FTP_Services.Core.Models namespace FTP_Services.Core.Models
{ {
public class PatientDocumentDetailsModel public class PatientDocumentRequest
{
public int UserId { get; set; }
public int PatientId { get; set; }
public int RecType { get; set; }
public int AdmissionID { get; set; }
public int DocumentType { get; set; }
public int PatDocId { get; set; }
public List<PatientImgDoc> PatientImgDoc { get; set; }
}
public class PatientImgDoc
{
public DateTime UploadedDate { get; set; }
public string Description { get; set; }
public string DocumentName { get; set; }
public long Size { get; set; }
public string DocumentUrl { get; set; }
public int SlNo { get; set; }
}
public class PatientDocumentDetailsModel1
{ {
public int DocumentType { get; set; } public int DocumentType { get; set; }
public string Description { get; set; } public string Description { get; set; }
...@@ -18,7 +38,7 @@ namespace FTP_Services.Core.Models ...@@ -18,7 +38,7 @@ namespace FTP_Services.Core.Models
public int SortNo { get; set; } public int SortNo { get; set; }
public int RecType { get; set; } public int RecType { get; set; }
public PatientDocumentDetailsModel() public PatientDocumentDetailsModel1()
{ {
DocumentType = 0; DocumentType = 0;
Description = ""; Description = "";
...@@ -38,7 +58,6 @@ namespace FTP_Services.Core.Models ...@@ -38,7 +58,6 @@ namespace FTP_Services.Core.Models
} }
} }
public class FileResponseModel public class FileResponseModel
{ {
public string Base64String { get; set; } public string Base64String { get; set; }
...@@ -132,6 +151,7 @@ namespace FTP_Services.Core.Models ...@@ -132,6 +151,7 @@ namespace FTP_Services.Core.Models
Name = ""; Name = "";
} }
} }
public class ConfigValues public class ConfigValues
{ {
public int ID { get; set; } public int ID { get; set; }
...@@ -152,7 +172,6 @@ namespace FTP_Services.Core.Models ...@@ -152,7 +172,6 @@ namespace FTP_Services.Core.Models
public string RemotePort { get; set; } public string RemotePort { get; set; }
public string ToolVersion { get; set; } public string ToolVersion { get; set; }
public ConfigValues() public ConfigValues()
{ {
ID = -1; ID = -1;
...@@ -200,7 +219,6 @@ namespace FTP_Services.Core.Models ...@@ -200,7 +219,6 @@ namespace FTP_Services.Core.Models
public string AdmissionDate { get; set; } public string AdmissionDate { get; set; }
public PatientDocuments() public PatientDocuments()
{ {
PatientId = -1; PatientId = -1;
...@@ -227,6 +245,7 @@ namespace FTP_Services.Core.Models ...@@ -227,6 +245,7 @@ namespace FTP_Services.Core.Models
AdmissionDate = ""; AdmissionDate = "";
} }
} }
public class Admissions public class Admissions
{ {
public int ID { get; set; } public int ID { get; set; }
...@@ -248,20 +267,22 @@ namespace FTP_Services.Core.Models ...@@ -248,20 +267,22 @@ namespace FTP_Services.Core.Models
RecordCount = -1; RecordCount = -1;
} }
} }
public class AdmissionDischargeHistData public class AdmissionDischargeHistData
{ {
public string Parm_AdmData { get; set; } public string Parm_AdmData { get; set; }
} }
public class PatientHistData public class PatientHistData
{ {
public string Parm_PatientData { get; set; } public string Parm_PatientData { get; set; }
} }
public class SQLRequest public class SQLRequest
{ {
public string sql { get; set; } public string sql { get; set; }
} }
public class AdmissionDischargeModel public class AdmissionDischargeModel
{ {
public int MRDId { get; set; } public int MRDId { get; set; }
...@@ -274,6 +295,7 @@ namespace FTP_Services.Core.Models ...@@ -274,6 +295,7 @@ namespace FTP_Services.Core.Models
public DateTime? AdmissionDate { get; set; } public DateTime? AdmissionDate { get; set; }
public int AdmissionTypeId { get; set; } public int AdmissionTypeId { get; set; }
public DateTime? DischargeDate { get; set; } public DateTime? DischargeDate { get; set; }
//public int DischargeTypeId { get; set; } //public int DischargeTypeId { get; set; }
public string DischargeType { get; set; } public string DischargeType { get; set; }
public string Cause { get; set; } public string Cause { get; set; }
...@@ -306,20 +328,20 @@ namespace FTP_Services.Core.Models ...@@ -306,20 +328,20 @@ namespace FTP_Services.Core.Models
public class ProcedureModel public class ProcedureModel
{ {
public string ProcName { get; set; } public string ProcName { get; set; }
} }
public class PatientImgDocSort public class PatientImgDocSort
{ {
public int UserId { get; set; } public int UserId { get; set; }
public List<PatientImgDocModel> PatientImgDoc { get; set; } public List<PatientImgDocModel> PatientImgDoc { get; set; }
} }
public class PatientImgDocModel public class PatientImgDocModel
{ {
public int PatDocId { get; set; } public int PatDocId { get; set; }
public int SortNo { get; set; } public int SortNo { get; set; }
} }
public class PatientDocumentsPathsData public class PatientDocumentsPathsData
{ {
public int PatientId { get; set; } public int PatientId { get; set; }
...@@ -334,4 +356,15 @@ namespace FTP_Services.Core.Models ...@@ -334,4 +356,15 @@ namespace FTP_Services.Core.Models
public string? FolderPath { get; set; } public string? FolderPath { get; set; }
public List<string>? FilePaths { get; set; } public List<string>? FilePaths { get; set; }
} }
public class FTPDocumentResponseModel
{
public string? FolderPath { get; set; }
public List<string>? FilePaths { get; set; }
public string? RemoteHost { get; set; }
public string? RemoteUser { get; set; }
public string? RemotePassword { get; set; }
public int RemotePort { get; set; }
public string? WebRemotePath { get; set; }
}
} }
...@@ -138,9 +138,10 @@ if (app.Environment.IsDevelopment()) ...@@ -138,9 +138,10 @@ if (app.Environment.IsDevelopment())
} }
else else
{ {
//app.Run(); //For Test Site app.Run(); //For Test Site
app.Run("http://*:4708"); // For Production //app.Run("http://*:4708"); // For Production
//app.Run("http://*:4709"); // For Admin //app.Run("http://*:4709"); // For Admin
} }
...@@ -17,6 +17,7 @@ namespace FTP_Services.Services ...@@ -17,6 +17,7 @@ namespace FTP_Services.Services
{ {
#region Variables #region Variables
protected PetaPoco.Database _repository; protected PetaPoco.Database _repository;
protected PetaPoco.Database _adminRepository;
//protected IConfiguration _configuration; //protected IConfiguration _configuration;
protected AppSettings _appSettings; protected AppSettings _appSettings;
protected readonly log4net.ILog log = log4net.LogManager.GetLogger("BaseDataAdapter"); protected readonly log4net.ILog log = log4net.LogManager.GetLogger("BaseDataAdapter");
...@@ -26,16 +27,19 @@ namespace FTP_Services.Services ...@@ -26,16 +27,19 @@ namespace FTP_Services.Services
public BaseDataAdapter(AppSettings appSettings) public BaseDataAdapter(AppSettings appSettings)
{ {
log.Debug("BaseDataAdapter() called"); log.Debug("BaseDataAdapter() called");
//this._configuration=configuration; this._appSettings = appSettings;
//string constr = _configuration.GetSection("MySettings").GetSection("ConnectionString").Value;
this._appSettings=appSettings;
string constr = _appSettings.ConnectionString; string constr = _appSettings.ConnectionString;
log.Debug("Connection String -" + constr); log.Debug("Connection String -" + constr);
// this._repository = new PetaPoco.Database(new Npgsql.NpgsqlConnection(constr));
_auth_user_id=0; _auth_user_id=0;
_user_id=0; _user_id=0;
// this._repository = new PetaPoco.Database(constr,"Microsoft.Data.SqlClient");
_repository = new PetaPoco.Database(constr, "npgsql"); _repository = new PetaPoco.Database(constr, "npgsql");
string Adminconstr = _appSettings.AdminConnectionString;
log.Debug("Connection String -" + constr);
_auth_user_id=0;
_user_id=0;
_repository = new PetaPoco.Database(Adminconstr, "npgsql");
} }
public void Dispose() public void Dispose()
......
This diff is collapsed.
{ {
"AppSettings": { "AppSettings": {
"Secret": "A78E-F7FA-B0FD-DAA45BB866CD-AA73D560-DACC-978C-4A9B-9924-5DE7E33F0040-GCD00", "Secret": "A78E-F7FA-B0FD-DAA45BB866CD-AA73D560-DACC-978C-4A9B-9924-5DE7E33F0040-GCD00",
"ConnectionString101": "SERVER=192.168.1.101;PORT=5432;UID=dbuser;PWD=dbuser123!;Database=FF_test_20250620;Timeout=1000", "ConnectionString": "SERVER=10.11.12.158;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=Fernandez_Test_20250718;Timeout=1000",
"ConnectionString158": "SERVER=10.11.12.158;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=FF_TEST_16052025;Timeout=1000",
"AdminConnectionString": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;database=CareaxesAdmin;Timeout=1000", "AdminConnectionString": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;database=CareaxesAdmin;Timeout=1000",
"ConnectionString": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=fernandez_20241125;Timeout=1000", "ConnectionString_MRD": "SERVER=10.11.12.158;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=MRD_DEMO;Timeout=1000",
"ConnectionString207": "SERVER=192.168.7.207;PORT=5432;UID=ff4dbuser;PWD=dbuser4ff123!;Database=fernandez_test_20250409_dev;Timeout=1000",
"FTPConfiguration": { "FTPConfiguration": {
"Username": "admin", "Username": "admin",
"Password": "Fmh@xp@rt01", "Password": "Fmh@xp@rt01",
...@@ -19,7 +17,7 @@ ...@@ -19,7 +17,7 @@
"SecondaryFolderPath": "D:\\GT\\Second_Folder" "SecondaryFolderPath": "D:\\GT\\Second_Folder"
}, },
"MappedDriveSettings": { "MappedDriveSettings": {
"BaseDirectory": "Z:\\FTPAPI" "BaseDirectory": "E:\\MRD_IMAGES\\MRD_UAT"
}, },
"ResolutionSettings": { "ResolutionSettings": {
"Height": "20", "Height": "20",
......
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