|
|
@ -4,12 +4,14 @@ using Microsoft.EntityFrameworkCore; |
|
|
using Microsoft.Extensions.Configuration; |
|
|
using Microsoft.Extensions.Configuration; |
|
|
using Microsoft.Extensions.Logging; |
|
|
using Microsoft.Extensions.Logging; |
|
|
using NPOI.POIFS.Storage; |
|
|
using NPOI.POIFS.Storage; |
|
|
|
|
|
using NPOI.SS.Formula.Functions; |
|
|
using NPOI.Util; |
|
|
using NPOI.Util; |
|
|
using NUglify.Helpers; |
|
|
using NUglify.Helpers; |
|
|
using Shentun.Pacs.ColumnReferenceCodes; |
|
|
using Shentun.Pacs.ColumnReferenceCodes; |
|
|
using Shentun.Pacs.CustomerOrgs; |
|
|
using Shentun.Pacs.CustomerOrgs; |
|
|
using Shentun.Pacs.Devices; |
|
|
using Shentun.Pacs.Devices; |
|
|
using Shentun.Pacs.Enums; |
|
|
using Shentun.Pacs.Enums; |
|
|
|
|
|
using Shentun.Pacs.Migrations; |
|
|
using Shentun.Pacs.Models; |
|
|
using Shentun.Pacs.Models; |
|
|
using Shentun.Pacs.PatientRegisters; |
|
|
using Shentun.Pacs.PatientRegisters; |
|
|
using Shentun.Pacs.Patients; |
|
|
using Shentun.Pacs.Patients; |
|
|
@ -1706,8 +1708,20 @@ namespace Shentun.Pacs.PacsBusiness |
|
|
|
|
|
|
|
|
string pictureFilename = $"{shareAddress}{item.PictureFilename.Replace(pacsRequestPath, "/").Replace("//", "/").Replace("/", @"\")}";
|
|
|
string pictureFilename = $"{shareAddress}{item.PictureFilename.Replace(pacsRequestPath, "/").Replace("//", "/").Replace("/", @"\")}";
|
|
|
|
|
|
|
|
|
int maxId = await oldDb.Ado.GetIntAsync("select isnull(max(check_picture_id),0) from check_picture"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
string maxIdString = oldDb.Ado.UseStoredProcedure().GetString("proc_getprimarykey", new List<SugarParameter>() { |
|
|
|
|
|
new SugarParameter("@primarykey_builder_id","check_picture_id"), |
|
|
|
|
|
new SugarParameter("@serial_no_len",10), |
|
|
|
|
|
new SugarParameter("@null_date_string",'1') |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
int maxId; |
|
|
|
|
|
|
|
|
|
|
|
bool isMaxId = int.TryParse(maxIdString, out maxId); |
|
|
|
|
|
|
|
|
|
|
|
if (isMaxId) |
|
|
|
|
|
{ |
|
|
await oldDb.Ado.ExecuteCommandAsync("insert into check_picture(check_picture_id,patient_register_id,asbitem_id,device_id,picture_filename,print_flag," + |
|
|
await oldDb.Ado.ExecuteCommandAsync("insert into check_picture(check_picture_id,patient_register_id,asbitem_id,device_id,picture_filename,print_flag," + |
|
|
"local_store_flag,display_order,is_new_pacs) VALUES (@check_picture_id,@patient_register_id,@asbitem_id,@device_id,@picture_filename,@print_flag,@local_store_flag,@display_order,@is_new_pacs);", |
|
|
"local_store_flag,display_order,is_new_pacs) VALUES (@check_picture_id,@patient_register_id,@asbitem_id,@device_id,@picture_filename,@print_flag,@local_store_flag,@display_order,@is_new_pacs);", |
|
|
new List<SugarParameter>() { |
|
|
new List<SugarParameter>() { |
|
|
@ -1719,10 +1733,12 @@ namespace Shentun.Pacs.PacsBusiness |
|
|
new SugarParameter("local_store_flag",'Y'), |
|
|
new SugarParameter("local_store_flag",'Y'), |
|
|
new SugarParameter("display_order",registerCheckPictureList.IndexOf(item)+1), |
|
|
new SugarParameter("display_order",registerCheckPictureList.IndexOf(item)+1), |
|
|
new SugarParameter("is_new_pacs",'Y'), |
|
|
new SugarParameter("is_new_pacs",'Y'), |
|
|
new SugarParameter("check_picture_id",maxId+1), |
|
|
|
|
|
|
|
|
new SugarParameter("check_picture_id",maxId) |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
#endregion
|
|
|
#endregion
|
|
|
} |
|
|
} |
|
|
#endregion
|
|
|
#endregion
|
|
|
@ -1874,6 +1890,7 @@ namespace Shentun.Pacs.PacsBusiness |
|
|
|
|
|
|
|
|
#endregion
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// 转换老系统性别
|
|
|
/// 转换老系统性别
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|