Commit 76e0bbc7 authored by Krishna Reddy Tamatam's avatar Krishna Reddy Tamatam

Changes upto 22-08-2025

parent 6fe1a321
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="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" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
......
...@@ -8,12 +8,17 @@ namespace FTP_Services.Core.Models ...@@ -8,12 +8,17 @@ namespace FTP_Services.Core.Models
public AppSettings() public AppSettings()
{ {
Secret =""; Secret = "";
ConnectionString = ""; ConnectionString = "";
AdminConnectionString =""; AdminConnectionString = "";
} }
public FTPConfiguration FTPConfiguration { get; set; } public FTPConfiguration FTPConfiguration { get; set; }
public FolderOptions FolderOptions { get; set; }
public MappedDriveSettings MappedDriveSettings { get; set; }
public ResolutionSettings ResolutionSettings { get; set; }
} }
public class FTPConfiguration public class FTPConfiguration
...@@ -31,9 +36,32 @@ namespace FTP_Services.Core.Models ...@@ -31,9 +36,32 @@ namespace FTP_Services.Core.Models
Password = ""; Password = "";
FtpURL = ""; FtpURL = "";
FTPMODE = false; FTPMODE = false;
DestinationPathFtp =""; DestinationPathFtp = "";
DestinationPathFile=""; DestinationPathFile = "";
}
}
public class FolderOptions
{
public string PrimaryFolderPath { get; set; }
public string SecondaryFolderPath { get; set; }
public FolderOptions()
{
PrimaryFolderPath = "";
SecondaryFolderPath = "";
}
}
public class MappedDriveSettings
{
public string? BaseDirectory { get; set; }
} }
public class ResolutionSettings
{
public string? Height { get; set; }
public string? Width { get; set; }
} }
} }
...@@ -16,7 +16,7 @@ namespace FTP_Services.Core.Models ...@@ -16,7 +16,7 @@ namespace FTP_Services.Core.Models
public string UploadedDate { get; set; } public string UploadedDate { get; set; }
public int AdmissionID { get; set; } public int AdmissionID { get; set; }
public int SortNo { get; set; } public int SortNo { get; set; }
public int IsOldData{get; set; } public int RecType { get; set; }
public PatientDocumentDetailsModel() public PatientDocumentDetailsModel()
{ {
...@@ -34,7 +34,7 @@ namespace FTP_Services.Core.Models ...@@ -34,7 +34,7 @@ namespace FTP_Services.Core.Models
UploadedDate = ""; UploadedDate = "";
AdmissionID = 0; AdmissionID = 0;
SortNo = 1; SortNo = 1;
IsOldData = 1; RecType = 1;
} }
} }
...@@ -248,6 +248,20 @@ namespace FTP_Services.Core.Models ...@@ -248,6 +248,20 @@ namespace FTP_Services.Core.Models
RecordCount = -1; RecordCount = -1;
} }
} }
public class AdmissionDischargeHistData
{
public string Parm_AdmData { get; set; }
}
public class PatientHistData
{
public string Parm_PatientData { get; set; }
}
public class SQLRequest
{
public string sql { get; set; }
}
public class AdmissionDischargeModel public class AdmissionDischargeModel
{ {
public int MRDId { get; set; } public int MRDId { get; set; }
...@@ -273,7 +287,7 @@ namespace FTP_Services.Core.Models ...@@ -273,7 +287,7 @@ namespace FTP_Services.Core.Models
public string Diagnosis { get; set; } public string Diagnosis { get; set; }
public string MRD_OtherProcedures { get; set; } public string MRD_OtherProcedures { get; set; }
public int IsOldData { get; set; } public int RecType { get; set; }
} }
// Supporting Models // Supporting Models
...@@ -306,5 +320,18 @@ namespace FTP_Services.Core.Models ...@@ -306,5 +320,18 @@ namespace FTP_Services.Core.Models
public int PatDocId { get; set; } public int PatDocId { get; set; }
public int SortNo { get; set; } public int SortNo { get; set; }
} }
public class PatientDocumentsPathsData
{
public int PatientId { get; set; }
public int PatientDocumentId { get; set; }
public bool ExternalFtp { get; set; }
public string? DocumentName { get; set; }
public string? DocumentPath { get; set; }
}
public class DocumentResponseModel
{
public string? FolderPath { get; set; }
public List<string>? FilePaths { get; set; }
}
} }
...@@ -134,12 +134,12 @@ app.UseEndpoints(endpoints => ...@@ -134,12 +134,12 @@ app.UseEndpoints(endpoints =>
if (app.Environment.IsDevelopment()) if (app.Environment.IsDevelopment())
{ {
app.Run("http://localhost:5603"); app.Run("http://localhost:5604");
} }
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
} }
......
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",
"ConnectionString": "SERVER=192.168.1.101;PORT=5432;UID=dbuser;PWD=dbuser123!;Database=FF_test_20250620;Timeout=1000",
"ConnectionString158": "SERVER=10.11.12.158;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=FF_TEST_16052025;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", "ConnectionString106": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=fernandez_20241125;Timeout=1000",
"ConnectionString207": "SERVER=192.168.7.207;PORT=5432;UID=ff4dbuser;PWD=dbuser4ff123!;Database=fernandez_test_20250409_dev;Timeout=1000", "ConnectionString207": "SERVER=192.168.7.207;PORT=5432;UID=ff4dbuser;PWD=dbuser4ff123!;Database=fernandez_test_20250409_dev;Timeout=1000",
"ConnectionString1": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;database=fernandez_20241125;Timeout=1000",
"AdminConnectionString1": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;database=fernandez_20241125;Timeout=1000",
"FTPConfiguration": { "FTPConfiguration": {
"Username": "admin", "Username": "admin",
"Password": "Fmh@xp@rt01", "Password": "Fmh@xp@rt01",
...@@ -14,6 +13,17 @@ ...@@ -14,6 +13,17 @@
"FTPMODE": false, "FTPMODE": false,
"DestinationPathFile": "/ftproot/FTPRoot/", "DestinationPathFile": "/ftproot/FTPRoot/",
"DestinationPathFtp": "/apachetomcat/webapps/documents/" "DestinationPathFtp": "/apachetomcat/webapps/documents/"
},
"FolderOptions": {
"PrimaryFolderPath": "D:\\GT\\PrimaryFolder",
"SecondaryFolderPath": "D:\\GT\\Second_Folder"
},
"MappedDriveSettings": {
"BaseDirectory": "Z:\\FTPAPI"
},
"ResolutionSettings": {
"Height": "20",
"Width":"20"
} }
}, },
"https_port": 8001, "https_port": 8001,
......
<html> <html>
<head> <head>
<title>FTP API</title> <title>HIMS Scanner API</title>
</head> </head>
<body> <body>
<h1>Welcome to FTP API</h1> <h1>Welcome to HIMS Scanner API</h1>
</body> </body>
</html> </html>
\ No newline at end of file
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