Config - Departments - in progress

This commit is contained in:
2019-12-04 13:59:00 +00:00
parent 15541b77aa
commit 114aa49535
90 changed files with 3430 additions and 660 deletions
@@ -59,7 +59,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
}
SpmAdmissionAction admissionAction = null;
// Query data.
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -94,7 +94,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
ClearErrorState();
if (!IsValidAdmissionAction(admissionAction)) return false;
if (SysId.IsValid(admissionAction.Id)) return SetErrorState(ErrorMessage.ValiditemId);
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -105,7 +105,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
if (SwmAdmissionAction_Db.FieldsNonId.Contains("Id"))
{
// Generate next Id.
dbAdmissionAction._Id = SysId.ToInt(db.GetNextId("AdmissionAction", dbUpdateInfo));
dbAdmissionAction._Id = SysId.ToInt(Database.GetNextId("AdmissionAction", dbUpdateInfo));
}
dbAdmissionAction.ExecuteInsertCommand(dbCommand);
admissionAction.Id = new SysId(dbAdmissionAction._Id);
@@ -122,7 +122,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
ClearErrorState();
if (!IsValidAdmissionAction(admissionAction)) return false;
if (!SysId.IsValid(admissionAction.Id)) return SetErrorState(ErrorMessage.InvalidItemId);
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -158,7 +158,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
{
ClearErrorState();
if (!AdmissionActionCanBeDeleted(admissionAction)) return false;
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -419,7 +419,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
filters.Add(SpmDbDfn.GetColumnNameQual(SpmDbDfn.ColumnIdx.SwmFacility_DepartmentId, aliasAdmission_Facility) + "=" + prm.DepartmentId.ToString());
else
{
DbQuery qry = new DbQuery(db.DbmsType);
DbQuery qry = new DbQuery(Database.DbmsType);
qry.Tables.Add(new StringPair(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmFacility), aliasAdmission_Facility));
qry.Columns.Add(SpmDbDfn.GetColumnNameQual(SpmDbDfn.ColumnIdx.SwmFacility_Id));
qry.Filters.Add(SpmDbDfn.GetColumnNameQual(SpmDbDfn.ColumnIdx.SwmFacility_DepartmentId) + "=" + prm.DepartmentId.ToString());
@@ -431,7 +431,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
filtersDepartIdFacilityId.Add(SpmDbDfn.GetColumnNameQual(SpmDbDfn.ColumnIdx.SwmAdmission_FacilityId, aliasAdmission) + "=" + prm.FacilityId.ToString());
else
{
DbQuery qry = new DbQuery(db.DbmsType);
DbQuery qry = new DbQuery(Database.DbmsType);
qry.Tables.Add(new StringPair(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmission), aliasAdmission));
qry.Columns.Add(SpmDbDfn.GetColumnNameQual(SpmDbDfn.ColumnIdx.SwmAdmission_Id, aliasAdmission));
qry.Filters.AddRange(filtersDepartIdFacilityId);
@@ -497,7 +497,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
private long GetAdmissionActionCount(String filter)
{
ClearErrorState();
return db.GetRowCount(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionAction) + " As " + aliasAdmissionAction, filter);
return Database.GetRowCount(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionAction) + " As " + aliasAdmissionAction, filter);
}
public override long GetAdmissionActionCount(SpmAdmissionAction.Params prm)
{
@@ -510,12 +510,12 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
public override List<SpmAdmissionAction> GetAdmissionActionList(SpmAdmissionAction.Params prm)
{
List<SpmAdmissionAction> AdmissionActiones = new List<SpmAdmissionAction>();
DbQuery qry = new DbQuery(db.DbmsType);
DbQuery qry = new DbQuery(Database.DbmsType);
qry.Tables.Add(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionAction), aliasAdmissionAction);
qry.Columns.AddRange(SwmAdmissionAction_Db.Fields);
qry.Filters.AddRange(GetAdmissionActionQueryFilter(prm));
// Query data.
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -548,7 +548,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
//---------------------------------------------------------------
// Construct query.
DbQuery query = new DbQuery(db.DbmsType);
DbQuery query = new DbQuery(Database.DbmsType);
query.Tables.Add(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionAction), aliasAdmissionAction);
// AdmissionAction Properties - add columns as defined in query list.
@@ -652,8 +652,8 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
}
//---------------------------------------------------------------
//return new DbResultSet_DataTableReader(db, query.BuildQuery());
return new Sarand.Win.Dbas.Data.DbResultSet_DataReader(db, query.BuildQuery());
//return new DbResultSet_DataTableReader(Database, query.BuildQuery());
return new Sarand.Win.Dbas.Data.DbResultSet_DataReader(Database, query.BuildQuery());
}
//-------------------------------------------------------------------