diff --git a/src/Shentun.Pacs.Application.Contracts/Asbitems/AsbitemDto.cs b/src/Shentun.Pacs.Application.Contracts/Asbitems/AsbitemDto.cs
index 11a3940..69cb990 100644
--- a/src/Shentun.Pacs.Application.Contracts/Asbitems/AsbitemDto.cs
+++ b/src/Shentun.Pacs.Application.Contracts/Asbitems/AsbitemDto.cs
@@ -184,5 +184,15 @@ namespace Shentun.Pacs.Asbitems
/// 是否隐私项目
///
public char IsPrivacy { get; set; }
+
+ ///
+ /// 是否出片
+ ///
+ public char IsFilmRelease { get; set; }
+
+ ///
+ /// 英文简称
+ ///
+ public string EnglishShortName { get; set; }
}
}
diff --git a/src/Shentun.Pacs.Application.Contracts/Asbitems/CreateAsbitemDto.cs b/src/Shentun.Pacs.Application.Contracts/Asbitems/CreateAsbitemDto.cs
index b7d9a95..285fc4e 100644
--- a/src/Shentun.Pacs.Application.Contracts/Asbitems/CreateAsbitemDto.cs
+++ b/src/Shentun.Pacs.Application.Contracts/Asbitems/CreateAsbitemDto.cs
@@ -179,5 +179,16 @@ namespace Shentun.Pacs.Asbitems
/// 是否隐私项目
///
public char IsPrivacy { get; set; } = 'N';
+
+
+ ///
+ /// 是否出片
+ ///
+ public char IsFilmRelease { get; set; } = 'N';
+
+ ///
+ /// 英文简称
+ ///
+ public string EnglishShortName { get; set; }
}
}
diff --git a/src/Shentun.Pacs.Application.Contracts/Asbitems/UpdateAsbitemDto.cs b/src/Shentun.Pacs.Application.Contracts/Asbitems/UpdateAsbitemDto.cs
index 18d642d..7c17c13 100644
--- a/src/Shentun.Pacs.Application.Contracts/Asbitems/UpdateAsbitemDto.cs
+++ b/src/Shentun.Pacs.Application.Contracts/Asbitems/UpdateAsbitemDto.cs
@@ -176,5 +176,15 @@ namespace Shentun.Pacs.Asbitems
/// 是否隐私项目
///
public char IsPrivacy { get; set; } = 'N';
+
+ ///
+ /// 是否出片
+ ///
+ public char IsFilmRelease { get; set; } = 'N';
+
+ ///
+ /// 英文简称
+ ///
+ public string EnglishShortName { get; set; }
}
}
diff --git a/src/Shentun.Pacs.Application.Contracts/Worklists/GetWorklistPatientListDto.cs b/src/Shentun.Pacs.Application.Contracts/Worklists/GetWorklistPatientListDto.cs
index 9276e4c..a926f8b 100644
--- a/src/Shentun.Pacs.Application.Contracts/Worklists/GetWorklistPatientListDto.cs
+++ b/src/Shentun.Pacs.Application.Contracts/Worklists/GetWorklistPatientListDto.cs
@@ -18,7 +18,11 @@ namespace Shentun.Pacs.Worklists
///
/// 姓名
///
- public string Forename { get; set; }
+ public string Forename { get; set; }
+ ///
+ /// 全拼姓名
+ ///
+ public string PYForename { get; set; }
public string Title { get; set; }
@@ -48,7 +52,9 @@ namespace Shentun.Pacs.Worklists
public string ExamRoom { get; set; }
- public string ExamDescription { get; set; }
+ public string ExamDescription { get; set; }
+
+ public string ExamEngDescription { get; set; }
public string StudyUID { get; set; }
diff --git a/src/Shentun.Pacs.Application/Asbitems/AsbitemAppService.cs b/src/Shentun.Pacs.Application/Asbitems/AsbitemAppService.cs
index e692167..2cb5bb6 100644
--- a/src/Shentun.Pacs.Application/Asbitems/AsbitemAppService.cs
+++ b/src/Shentun.Pacs.Application/Asbitems/AsbitemAppService.cs
@@ -151,6 +151,8 @@ namespace Shentun.Pacs.Asbitems
IsCriticalValueFunction = s.a.IsCriticalValueFunction,
IsFollowUpFunction = s.a.IsFollowUpFunction,
IsPrivacy = s.a.IsPrivacy,
+ IsFilmRelease = s.a.IsFilmRelease,
+ EnglishShortName = s.a.EnglishShortName,
//IsDisablePregnancy = s.a.IsDisablePregnancy,
//IsDisablePreparePregnancy = s.a.IsDisablePreparePregnancy,
CreatorName = s.ab != null ? s.ab.Surname : "",
diff --git a/src/Shentun.Pacs.Application/PacsBusiness/PacsBusinessAppService.cs b/src/Shentun.Pacs.Application/PacsBusiness/PacsBusinessAppService.cs
index 9d02807..136f15b 100644
--- a/src/Shentun.Pacs.Application/PacsBusiness/PacsBusinessAppService.cs
+++ b/src/Shentun.Pacs.Application/PacsBusiness/PacsBusinessAppService.cs
@@ -376,7 +376,7 @@ namespace Shentun.Pacs.PacsBusiness
}
///
- /// 获取pacs检查项目
+ /// 获取pacs检查项目 pacs看图界面列表
///
///
///
@@ -811,6 +811,7 @@ namespace Shentun.Pacs.PacsBusiness
#region 新流程增加接口
+
/////
///// 导入老系统人员、项目数据,并自动加入worklist
/////
@@ -818,8 +819,9 @@ namespace Shentun.Pacs.PacsBusiness
/////
/////
//[HttpPost("api/app/PacsBusiness/ImportPeisCheckDataByCheckRequestNo")]
- //public async Task ImportPeisCheckDataByCheckRequestNoAsync(ImportPeisCheckDataByCheckRequestNoInputDto input)
+ //public async Task ImportPeisCheckDataByCheckRequestNoAsync(ImportPeisCheckDataByCheckRequestNoInputDto input)
//{
+ // var entDto = new PatientRegisterOrNoDto();
// if (string.IsNullOrWhiteSpace(input.CheckRequestNo))
// {
@@ -837,6 +839,31 @@ namespace Shentun.Pacs.PacsBusiness
// throw new UserFriendlyException("预检AET不能为空");
// }
+
+ // var pacsDeviceEnt = await _deviceRepository.FirstOrDefaultAsync(f => f.Id == Guid.Parse(input.DeviceId));
+ // if (pacsDeviceEnt == null)
+ // {
+ // throw new UserFriendlyException("设备id不存在");
+ // }
+
+ // Guid deviceTypeColumnReferenId = Guid.Parse(_configuration.GetValue("OldPeis:DeviceTypeColumnReferenId", Guid.Empty.ToString()));
+
+ // var deviceTypeCodeValues = await _columnReferenceCodeManager.GetInterfaceCodeValueAsync(deviceTypeColumnReferenId, pacsDeviceEnt.DeviceTypeId.ToString());
+ // if (!deviceTypeCodeValues.Any())
+ // {
+ // throw new UserFriendlyException($"仪器编号:{input.DeviceId}所属的仪器类型没有对照");
+ // }
+
+ // if (deviceTypeCodeValues.Count() > 1)
+ // {
+ // throw new UserFriendlyException($"仪器编号:{input.DeviceId}所属的仪器类型有多个体检系统的仪器类型进行了对照");
+ // }
+
+ // //对照中体检系统的仪器类型,用于检索数据
+ // string oldDeviceTypeId = deviceTypeCodeValues.First();
+
+
+
// string connectionString = _configuration.GetValue("OldPeis:ConnectionStrings", "");
// SqlSugarClient oldDb = new SqlSugarClient(new ConnectionConfig()
// {
@@ -849,222 +876,251 @@ namespace Shentun.Pacs.PacsBusiness
// var oldRegisterAsbitemList = await oldDb.Ado.GetDataTableAsync("select a.name as patient_name,a.sex_id,a.mobile_telephone,a.telephone," +
// "a.age,a.id_card_no,a.marital_status_id,a.complete_flag," +
- // "b.patient_register_id,b.print_barcode_no,b.asbitem_id,b.price,b.standard_price,b.charge_flag,b.payment_mode,c.item_id " +
+ // "b.patient_register_id,b.print_barcode_no,b.asbitem_id,b.price,b.standard_price,b.charge_flag,b.payment_mode " +
// "from patient_register as a left join register_asbitem as b on a.patient_register_id=b.patient_register_id " +
- // "left join register_item as c on b.asbitem_id=c.asbitem_id and a.patient_register_id=c.patient_register_id" +
- // $" where b.print_barcode_no='{input.CheckRequestNo}'");
+ // " left join asbitem as c on b.asbitem_id=c.asbitem_id " +
+ // $" where b.print_barcode_no='{input.CheckRequestNo}' and c.device_type_id='{oldDeviceTypeId}' ");
// if (oldRegisterAsbitemList.Rows.Count > 0)
// {
- // var registerCheckFirst = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
- // join patient in await _patientRepository.GetQueryableAsync() on patientRegister.PatientId equals patient.Id
- // join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
- // where registerCheck.CheckRequestNo == input.CheckRequestNo
- // select new
- // {
- // patientRegister,
- // registerCheck
- // }).FirstOrDefault();
-
- // if (registerCheckFirst == null)
- // {
- // #region 插入人员
-
- // #region 档案
- // var patientName = oldRegisterAsbitemList.Rows[0]["patient_name"].ToString();
- // var sexId = ConvertSex(oldRegisterAsbitemList.Rows[0]["sex_id"].ToString());
- // var mobileTelephone = oldRegisterAsbitemList.Rows[0]["mobile_telephone"].ToString();
- // var telephone = oldRegisterAsbitemList.Rows[0]["telephone"].ToString();
- // var idNo = oldRegisterAsbitemList.Rows[0]["id_card_no"].ToString();
- // short? age = string.IsNullOrWhiteSpace(oldRegisterAsbitemList.Rows[0]["age"].ToString()) ? null : Convert.ToInt16(oldRegisterAsbitemList.Rows[0]["age"].ToString());
- // var maritalStatusId = oldRegisterAsbitemList.Rows[0]["marital_status_id"].ToString() == "2" ? '4' : Convert.ToChar(oldRegisterAsbitemList.Rows[0]["marital_status_id"].ToString());
-
- // var patientQuery = await _patientRepository.GetQueryableAsync();
- // patientQuery = patientQuery.Where(m => m.DisplayName == patientName && m.SexId == sexId);
- // if (!string.IsNullOrWhiteSpace(mobileTelephone))
- // {
- // patientQuery = patientQuery.Where(m => m.MobileTelephone == mobileTelephone);
- // }
- // if (!string.IsNullOrWhiteSpace(idNo))
- // {
- // patientQuery = patientQuery.Where(m => m.IdNo == idNo);
- // }
-
- // //档案
- // var patientEnt = await patientQuery.FirstOrDefaultAsync();
-
- // if (patientEnt == null)
- // {
- // patientEnt = new Patient(GuidGenerator.Create())
- // {
- // BirthDate = null,
- // BirthPlaceId = null,
- // DisplayName = patientName,
- // Email = null,
- // IdNo = idNo,
- // MaritalStatusId = maritalStatusId,
- // MedicalCenterId = Guid.Empty,
- // MobileTelephone = mobileTelephone,
- // NationId = null,
- // PatientNo = await _manager.CreatePatientNo(Guid.Empty),
- // PatientPassword = "",
- // PostalCode = "",
- // SexId = sexId,
- // SimpleCode = LanguageConverter.GetPYSimpleCode(patientName),
- // Telephone = telephone
- // };
-
- // patientEnt = await _patientRepository.InsertAsync(patientEnt, true);
- // }
- // #endregion
-
- // #region 人员
- // var patientRegisterEnt = new PatientRegister(GuidGenerator.Create())
- // {
- // Age = age,
- // CompleteFlag = Convert.ToChar(oldRegisterAsbitemList.Rows[0]["complete_flag"].ToString()),
- // CustomerOrgId = GuidFlag.PersonCustomerOrgId,
- // CustomerOrgRegisterId = GuidFlag.PersonCustomerOrgRegisterId,
- // DeviceId = Guid.Parse(input.DeviceId),
- // GuidePrintTimes = 0,
- // IsAudit = 'N',
- // IsLock = 'N',
- // IsMedicalStart = 'Y',
- // IsNameHide = 'N',
- // IsPhoneFollow = 'N',
- // IsVip = 'N',
- // IsRecoverGuide = 'N',
- // IsUpload = 'N',
- // IsUploadAppoint = 'N',
- // MaritalStatusId = maritalStatusId,
- // MedicalCenterId = Guid.Empty,
- // MedicalTimes = 0,
- // PatientId = patientEnt.Id,
- // PatientName = patientName,
- // ReportPrintTimes = 0,
- // PatientRegisterNo = await _patientRegisterManager.CreatePatientRegisterNo(Guid.Empty),
- // SendFlag = '0',
- // SexId = sexId
- // };
-
- // patientRegisterEnt = await _patientRegisterRepository.InsertAsync(patientRegisterEnt, true);
- // #endregion
-
- // #region 登记项目 明细项目
-
- // string oldAsbitemId = oldRegisterAsbitemList.Rows[0]["asbitem_id"].ToString();
- // var oldAsbitemPrice = Convert.ToDecimal(oldRegisterAsbitemList.Rows[0]["price"].ToString());
- // var oldAsbitemStandardPrice = Convert.ToDecimal(oldRegisterAsbitemList.Rows[0]["standard_price"].ToString());
-
- // Guid asbitemColumnReferenId = Guid.Parse(_configuration.GetValue("OldPeis:AsbitemColumnReferenId", Guid.Empty.ToString()));
- // Guid itemColumnReferenId = Guid.Parse(_configuration.GetValue("OldPeis:ItemColumnReferenId", Guid.Empty.ToString()));
-
- // var asbitemCodeValues = await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(asbitemColumnReferenId, oldAsbitemId);
- // if (!asbitemCodeValues.Any())
- // {
- // throw new UserFriendlyException($"组合项目编号:{oldAsbitemId}没有对照");
- // }
-
- // if (asbitemCodeValues.Count() > 1)
- // {
- // throw new UserFriendlyException($"组合项目编号:{oldAsbitemId}有多个pacs项目进行了对照");
- // }
-
- // Guid asbitemId = Guid.Parse(asbitemCodeValues.First()); //pacs系统组合项目id
- // //检查
- // var registerCheckEnt = new RegisterCheck(GuidGenerator.Create())
- // {
- // CheckRequestNo = input.CheckRequestNo,
- // CheckRequestPrintTimes = 0,
- // CompleteFlag = RegisterCheckCompleteFlag.UnChecked,
- // IsAudit = 'N',
- // IsLock = 'N',
- // IsPacsCheck = 'N',
- // IsSignIn = 'Y',
- // PatientRegisterId = patientRegisterEnt.Id,
- // ScheduledAet = input.ScheduledAet,
- // WorklistFlag = '1',
- // WorklistPreCheckDate = DateTime.Now
- // };
-
- // registerCheckEnt = await _registerCheckRepository.InsertAsync(registerCheckEnt, true);
-
- // //组合项目
- // var registerCheckAsbitemEnt = new RegisterCheckAsbitem(GuidGenerator.Create())
- // {
- // Amount = 1,
- // AsbitemId = asbitemId,
- // ChargePrice = oldAsbitemPrice,
- // StandardPrice = oldAsbitemStandardPrice,
- // IsCharge = Convert.ToChar(oldRegisterAsbitemList.Rows[0]["charge_flag"].ToString()),
- // OldAsbitemId = oldAsbitemId,
- // OldPatientRegisterId = oldRegisterAsbitemList.Rows[0]["patient_register_id"].ToString(),
- // PatientRegisterId = patientRegisterEnt.Id,
- // PayTypeFlag = Convert.ToChar(oldRegisterAsbitemList.Rows[0]["payment_mode"].ToString()),
- // RegisterCheckId = registerCheckEnt.Id
- // };
-
- // registerCheckAsbitemEnt = await _registerCheckAsbitemRepository.InsertAsync(registerCheckAsbitemEnt, true);
-
- // //明细项目
-
- // List registerCheckItemList = new List();
-
- // foreach (DataRow row in oldRegisterAsbitemList.Rows)
- // {
- // string oldItemId = row["item_id"].ToString();
-
- // var itemCodeValues = await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(itemColumnReferenId, oldItemId);
- // if (!itemCodeValues.Any())
- // {
- // throw new UserFriendlyException($"项目编号:{oldItemId}没有对照");
- // }
- // if (itemCodeValues.Count() > 1)
- // {
- // throw new UserFriendlyException($"项目编号:{oldAsbitemId}有多个pacs项目进行了对照");
- // }
-
- // Guid itemId = Guid.Parse(itemCodeValues.First()); //pacs系统项目id
-
- // if (registerCheckItemList.Count(c => c.ItemId == itemId) == 0)
- // {
- // registerCheckItemList.Add(new RegisterCheckItem
- // {
- // ItemId = itemId,
- // RegisterCheckId = registerCheckEnt.Id,
- // });
- // }
- // }
-
- // if (registerCheckItemList.Any())
- // {
- // await _registerCheckItemRepository.InsertManyAsync(registerCheckItemList);
- // }
-
- // #endregion
-
- // #endregion
- // }
- // else
- // {
- // //更新设备id
- // registerCheckFirst.patientRegister.DeviceId = Guid.Parse(input.DeviceId);
-
- // await _patientRegisterRepository.UpdateAsync(registerCheckFirst.patientRegister);
-
- // }
+ // Guid tempPatientRegisterId = Guid.Empty;
+
+
+ // var registerCheckList = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+ // join patient in await _patientRepository.GetQueryableAsync() on patientRegister.PatientId equals patient.Id
+ // join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
+ // join device in await _deviceRepository.GetQueryableAsync() on patientRegister.DeviceId equals device.Id
+ // where registerCheck.CheckRequestNo == input.CheckRequestNo && device.DeviceTypeId == pacsDeviceEnt.DeviceTypeId
+ // select new
+ // {
+ // patientRegister,
+ // registerCheck
+ // }).ToList();
+
+ // //if (registerCheckList.Count == 0)
+ // //{
+ // // foreach (DataRow row in oldRegisterAsbitemList.Rows)
+ // // {
+ // // #region 档案
+ // // var patientName = row["patient_name"].ToString();
+ // // var sexId = ConvertSex(row["sex_id"].ToString());
+ // // var mobileTelephone = row["mobile_telephone"].ToString();
+ // // var telephone = row["telephone"].ToString();
+ // // var idNo = row["id_card_no"].ToString();
+ // // short? age = string.IsNullOrWhiteSpace(row["age"].ToString()) ? null : Convert.ToInt16(row["age"].ToString());
+ // // var maritalStatusId = row["marital_status_id"].ToString() == "2" ? '4' : Convert.ToChar(row["marital_status_id"].ToString());
+
+ // // var patientQuery = await _patientRepository.GetQueryableAsync();
+ // // patientQuery = patientQuery.Where(m => m.DisplayName == patientName && m.SexId == sexId);
+ // // if (!string.IsNullOrWhiteSpace(mobileTelephone))
+ // // {
+ // // patientQuery = patientQuery.Where(m => m.MobileTelephone == mobileTelephone);
+ // // }
+ // // if (!string.IsNullOrWhiteSpace(idNo))
+ // // {
+ // // patientQuery = patientQuery.Where(m => m.IdNo == idNo);
+ // // }
+
+ // // //档案
+ // // var patientEnt = await patientQuery.FirstOrDefaultAsync();
+
+ // // if (patientEnt == null)
+ // // {
+ // // patientEnt = new Patient(GuidGenerator.Create())
+ // // {
+ // // BirthDate = null,
+ // // BirthPlaceId = null,
+ // // DisplayName = patientName,
+ // // Email = null,
+ // // IdNo = idNo,
+ // // MaritalStatusId = maritalStatusId,
+ // // MedicalCenterId = Guid.Empty,
+ // // MobileTelephone = mobileTelephone,
+ // // NationId = null,
+ // // PatientNo = await _manager.CreatePatientNo(Guid.Empty),
+ // // PatientPassword = "",
+ // // PostalCode = "",
+ // // SexId = sexId,
+ // // SimpleCode = LanguageConverter.GetPYSimpleCode(patientName),
+ // // Telephone = telephone
+ // // };
+
+ // // patientEnt = await _patientRepository.InsertAsync(patientEnt, true);
+ // // }
+ // // #endregion
+
+ // // #region 人员
+
+ // // Guid patientRegisterId = Guid.Empty;
+
+ // // var isCheckRequestNo = await _registerCheckRepository.FirstOrDefaultAsync(f => f.CheckRequestNo == input.CheckRequestNo);
+ // // if (isCheckRequestNo == null)
+ // // {
+ // // var patientRegisterEnt = new PatientRegister(GuidGenerator.Create())
+ // // {
+ // // Age = age,
+ // // CompleteFlag = Convert.ToChar(row["complete_flag"].ToString()),
+ // // CustomerOrgId = GuidFlag.PersonCustomerOrgId,
+ // // CustomerOrgRegisterId = GuidFlag.PersonCustomerOrgRegisterId,
+ // // DeviceId = Guid.Parse(input.DeviceId),
+ // // GuidePrintTimes = 0,
+ // // IsAudit = 'N',
+ // // IsLock = 'N',
+ // // IsMedicalStart = 'Y',
+ // // IsNameHide = 'N',
+ // // IsPhoneFollow = 'N',
+ // // IsVip = 'N',
+ // // IsRecoverGuide = 'N',
+ // // IsUpload = 'N',
+ // // IsUploadAppoint = 'N',
+ // // MaritalStatusId = maritalStatusId,
+ // // MedicalCenterId = Guid.Empty,
+ // // MedicalTimes = 0,
+ // // PatientId = patientEnt.Id,
+ // // PatientName = patientName,
+ // // ReportPrintTimes = 0,
+ // // PatientRegisterNo = await _patientRegisterManager.CreatePatientRegisterNo(Guid.Empty),
+ // // SendFlag = '0',
+ // // SexId = sexId
+ // // };
+
+ // // patientRegisterEnt = await _patientRegisterRepository.InsertAsync(patientRegisterEnt, true);
+
+ // // patientRegisterId = patientRegisterEnt.Id;
+ // // }
+ // // else
+ // // {
+ // // patientRegisterId = isCheckRequestNo.PatientRegisterId;
+ // // }
+
+ // // tempPatientRegisterId = patientRegisterId;
+
+ // // #endregion
+
+ // // #region 登记项目 明细项目
+
+ // // string oldAsbitemId = row["asbitem_id"].ToString();
+ // // var oldAsbitemPrice = Convert.ToDecimal(row["price"].ToString());
+ // // var oldAsbitemStandardPrice = Convert.ToDecimal(row["standard_price"].ToString());
+
+ // // Guid asbitemColumnReferenId = Guid.Parse(_configuration.GetValue("OldPeis:AsbitemColumnReferenId", Guid.Empty.ToString()));
+ // // Guid itemColumnReferenId = Guid.Parse(_configuration.GetValue("OldPeis:ItemColumnReferenId", Guid.Empty.ToString()));
+
+ // // var asbitemCodeValues = await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(asbitemColumnReferenId, oldAsbitemId);
+ // // if (!asbitemCodeValues.Any())
+ // // {
+ // // throw new UserFriendlyException($"组合项目编号:{oldAsbitemId}没有对照");
+ // // }
+
+ // // if (asbitemCodeValues.Count() > 1)
+ // // {
+ // // throw new UserFriendlyException($"组合项目编号:{oldAsbitemId}有多个pacs项目进行了对照");
+ // // }
+
+ // // Guid asbitemId = Guid.Parse(asbitemCodeValues.First()); //pacs系统组合项目id
+ // // //检查
+ // // var registerCheckEnt = new RegisterCheck(GuidGenerator.Create())
+ // // {
+ // // CheckRequestNo = input.CheckRequestNo,
+ // // CheckRequestPrintTimes = 0,
+ // // CompleteFlag = RegisterCheckCompleteFlag.UnChecked,
+ // // IsAudit = 'N',
+ // // IsLock = 'N',
+ // // IsPacsCheck = 'N',
+ // // IsSignIn = 'Y',
+ // // PatientRegisterId = patientRegisterId,
+ // // ScheduledAet = input.ScheduledAet,
+ // // WorklistFlag = '1',
+ // // WorklistPreCheckDate = DateTime.Now
+ // // };
+
+ // // registerCheckEnt = await _registerCheckRepository.InsertAsync(registerCheckEnt, true);
+
+ // // //组合项目
+ // // var registerCheckAsbitemEnt = new RegisterCheckAsbitem(GuidGenerator.Create())
+ // // {
+ // // Amount = 1,
+ // // AsbitemId = asbitemId,
+ // // ChargePrice = oldAsbitemPrice,
+ // // StandardPrice = oldAsbitemStandardPrice,
+ // // IsCharge = Convert.ToChar(row["charge_flag"].ToString()),
+ // // OldAsbitemId = oldAsbitemId,
+ // // OldPatientRegisterId = row["patient_register_id"].ToString(),
+ // // PatientRegisterId = patientRegisterId,
+ // // PayTypeFlag = Convert.ToChar(row["payment_mode"].ToString()),
+ // // RegisterCheckId = registerCheckEnt.Id
+ // // };
+
+ // // registerCheckAsbitemEnt = await _registerCheckAsbitemRepository.InsertAsync(registerCheckAsbitemEnt, true);
+
+ // // //明细项目
+
+ // // List registerCheckItemList = new List();
+
+
+ // // var oldRegisterItemList = await oldDb.Ado.GetDataTableAsync($"select item_id from register_item where asbitem_id='{row["asbitem_id"].ToString()}' and patient_register_id='{row["patient_register_id"].ToString()}' ");
+
+ // // if (oldRegisterItemList.Rows.Count > 0)
+ // // {
+ // // foreach (DataRow rowItem in oldRegisterItemList.Rows)
+ // // {
+ // // string oldItemId = rowItem["item_id"].ToString();
+
+ // // var itemCodeValues = await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(itemColumnReferenId, oldItemId);
+ // // if (!itemCodeValues.Any())
+ // // {
+ // // throw new UserFriendlyException($"项目编号:{oldItemId}没有对照");
+ // // }
+ // // if (itemCodeValues.Count() > 1)
+ // // {
+ // // throw new UserFriendlyException($"项目编号:{oldAsbitemId}有多个pacs项目进行了对照");
+ // // }
+
+ // // Guid itemId = Guid.Parse(itemCodeValues.First()); //pacs系统项目id
+
+ // // if (registerCheckItemList.Count(c => c.ItemId == itemId) == 0)
+ // // {
+ // // registerCheckItemList.Add(new RegisterCheckItem
+ // // {
+ // // ItemId = itemId,
+ // // RegisterCheckId = registerCheckEnt.Id,
+ // // });
+ // // }
+ // // }
+ // // }
+
+ // // if (registerCheckItemList.Any())
+ // // {
+ // // await _registerCheckItemRepository.InsertManyAsync(registerCheckItemList);
+ // // }
+
+ // // #endregion
+
+ // // }
+ // //}
+ // //else
+ // //{
+ // // foreach (var item in registerCheckList)
+ // // {
+ // // item.patientRegister.DeviceId = Guid.Parse(input.DeviceId);
+ // // }
+ // // await _patientRegisterRepository.UpdateManyAsync(registerCheckList.Select(s => s.patientRegister).ToList());
+
+ // // tempPatientRegisterId = registerCheckList.First().patientRegister.Id;
+ // //}
+
+
+ // entDto = await _patientRegisterAppService.GetPatientRegisterOrNo(tempPatientRegisterId);
// }
// else
// {
// throw new UserFriendlyException("检查条码不正确");
// }
-
-
+ // return entDto;
//}
-
///
/// 导入老系统人员、项目数据,并自动加入worklist
///
@@ -1072,8 +1128,9 @@ namespace Shentun.Pacs.PacsBusiness
///
///
[HttpPost("api/app/PacsBusiness/ImportPeisCheckDataByCheckRequestNo")]
- public async Task ImportPeisCheckDataByCheckRequestNoAsync(ImportPeisCheckDataByCheckRequestNoInputDto input)
+ public async Task ImportPeisCheckDataByCheckRequestNoAsync(ImportPeisCheckDataByCheckRequestNoInputDto input)
{
+ var entDto = new PatientRegisterOrNoDto();
if (string.IsNullOrWhiteSpace(input.CheckRequestNo))
{
@@ -1091,6 +1148,31 @@ namespace Shentun.Pacs.PacsBusiness
throw new UserFriendlyException("预检AET不能为空");
}
+
+ var pacsDeviceEnt = await _deviceRepository.FirstOrDefaultAsync(f => f.Id == Guid.Parse(input.DeviceId));
+ if (pacsDeviceEnt == null)
+ {
+ throw new UserFriendlyException("设备id不存在");
+ }
+
+ Guid deviceTypeColumnReferenId = Guid.Parse(_configuration.GetValue("OldPeis:DeviceTypeColumnReferenId", Guid.Empty.ToString()));
+
+ var deviceTypeCodeValues = await _columnReferenceCodeManager.GetInterfaceCodeValueAsync(deviceTypeColumnReferenId, pacsDeviceEnt.DeviceTypeId.ToString());
+ if (!deviceTypeCodeValues.Any())
+ {
+ throw new UserFriendlyException($"仪器编号:{input.DeviceId}所属的仪器类型没有对照");
+ }
+
+ if (deviceTypeCodeValues.Count() > 1)
+ {
+ throw new UserFriendlyException($"仪器编号:{input.DeviceId}所属的仪器类型有多个体检系统的仪器类型进行了对照");
+ }
+
+ //对照中体检系统的仪器类型,用于检索数据
+ string oldDeviceTypeId = deviceTypeCodeValues.First();
+
+
+
string connectionString = _configuration.GetValue("OldPeis:ConnectionStrings", "");
SqlSugarClient oldDb = new SqlSugarClient(new ConnectionConfig()
{
@@ -1105,121 +1187,144 @@ namespace Shentun.Pacs.PacsBusiness
"a.age,a.id_card_no,a.marital_status_id,a.complete_flag," +
"b.patient_register_id,b.print_barcode_no,b.asbitem_id,b.price,b.standard_price,b.charge_flag,b.payment_mode " +
"from patient_register as a left join register_asbitem as b on a.patient_register_id=b.patient_register_id " +
- $" where b.print_barcode_no='{input.CheckRequestNo}'");
+ " left join asbitem as c on b.asbitem_id=c.asbitem_id " +
+ $" where b.print_barcode_no='{input.CheckRequestNo}' and c.device_type_id='{oldDeviceTypeId}' ");
if (oldRegisterAsbitemList.Rows.Count > 0)
{
+ Guid tempPatientRegisterId = Guid.Empty;
+
+
var registerCheckList = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
join patient in await _patientRepository.GetQueryableAsync() on patientRegister.PatientId equals patient.Id
join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
- where registerCheck.CheckRequestNo == input.CheckRequestNo
+ join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
+ join device in await _deviceRepository.GetQueryableAsync() on patientRegister.DeviceId equals device.Id
+ where registerCheck.CheckRequestNo == input.CheckRequestNo && device.DeviceTypeId == pacsDeviceEnt.DeviceTypeId
select new
{
patientRegister,
- registerCheck
+ registerCheck,
+ registerCheckAsbitem
}).ToList();
- if (registerCheckList.Count == 0)
+
+ #region 处理人员信息
+ if (registerCheckList.Count > 0)
+ {
+ //当前仪器类型下已登记过当前条码
+ //更新之前登记的人员信息中的仪器id
+ var fisrtPatientRegister = registerCheckList.Select(s => s.patientRegister).First();
+ fisrtPatientRegister.DeviceId = Guid.Parse(input.DeviceId);
+
+ await _patientRegisterRepository.UpdateAsync(fisrtPatientRegister);
+
+ }
+ else
{
- foreach (DataRow row in oldRegisterAsbitemList.Rows)
+ //未登记
+
+ DataRow row = oldRegisterAsbitemList.Rows[0];
+
+ #region 档案
+ var patientName = row["patient_name"].ToString();
+ var sexId = ConvertSex(row["sex_id"].ToString());
+ var mobileTelephone = row["mobile_telephone"].ToString();
+ var telephone = row["telephone"].ToString();
+ var idNo = row["id_card_no"].ToString();
+ short? age = string.IsNullOrWhiteSpace(row["age"].ToString()) ? null : Convert.ToInt16(row["age"].ToString());
+ var maritalStatusId = row["marital_status_id"].ToString() == "2" ? '4' : Convert.ToChar(row["marital_status_id"].ToString());
+
+ var patientQuery = await _patientRepository.GetQueryableAsync();
+ patientQuery = patientQuery.Where(m => m.DisplayName == patientName && m.SexId == sexId);
+ if (!string.IsNullOrWhiteSpace(mobileTelephone))
{
- #region 档案
- var patientName = row["patient_name"].ToString();
- var sexId = ConvertSex(row["sex_id"].ToString());
- var mobileTelephone = row["mobile_telephone"].ToString();
- var telephone = row["telephone"].ToString();
- var idNo = row["id_card_no"].ToString();
- short? age = string.IsNullOrWhiteSpace(row["age"].ToString()) ? null : Convert.ToInt16(row["age"].ToString());
- var maritalStatusId = row["marital_status_id"].ToString() == "2" ? '4' : Convert.ToChar(row["marital_status_id"].ToString());
-
- var patientQuery = await _patientRepository.GetQueryableAsync();
- patientQuery = patientQuery.Where(m => m.DisplayName == patientName && m.SexId == sexId);
- if (!string.IsNullOrWhiteSpace(mobileTelephone))
- {
- patientQuery = patientQuery.Where(m => m.MobileTelephone == mobileTelephone);
- }
- if (!string.IsNullOrWhiteSpace(idNo))
- {
- patientQuery = patientQuery.Where(m => m.IdNo == idNo);
- }
+ patientQuery = patientQuery.Where(m => m.MobileTelephone == mobileTelephone);
+ }
+ if (!string.IsNullOrWhiteSpace(idNo))
+ {
+ patientQuery = patientQuery.Where(m => m.IdNo == idNo);
+ }
- //档案
- var patientEnt = await patientQuery.FirstOrDefaultAsync();
+ //档案
+ var patientEnt = await patientQuery.FirstOrDefaultAsync();
- if (patientEnt == null)
+ if (patientEnt == null)
+ {
+ patientEnt = new Patient(GuidGenerator.Create())
{
- patientEnt = new Patient(GuidGenerator.Create())
- {
- BirthDate = null,
- BirthPlaceId = null,
- DisplayName = patientName,
- Email = null,
- IdNo = idNo,
- MaritalStatusId = maritalStatusId,
- MedicalCenterId = Guid.Empty,
- MobileTelephone = mobileTelephone,
- NationId = null,
- PatientNo = await _manager.CreatePatientNo(Guid.Empty),
- PatientPassword = "",
- PostalCode = "",
- SexId = sexId,
- SimpleCode = LanguageConverter.GetPYSimpleCode(patientName),
- Telephone = telephone
- };
-
- patientEnt = await _patientRepository.InsertAsync(patientEnt, true);
- }
- #endregion
+ BirthDate = null,
+ BirthPlaceId = null,
+ DisplayName = patientName,
+ Email = null,
+ IdNo = idNo,
+ MaritalStatusId = maritalStatusId,
+ MedicalCenterId = Guid.Empty,
+ MobileTelephone = mobileTelephone,
+ NationId = null,
+ PatientNo = await _manager.CreatePatientNo(Guid.Empty),
+ PatientPassword = "",
+ PostalCode = "",
+ SexId = sexId,
+ SimpleCode = LanguageConverter.GetPYSimpleCode(patientName),
+ Telephone = telephone
+ };
- #region 人员
+ patientEnt = await _patientRepository.InsertAsync(patientEnt, true);
+ }
+ #endregion
- Guid patientRegisterId = Guid.Empty;
+ #region 人员
+ var patientRegisterEnt = new PatientRegister(GuidGenerator.Create())
+ {
+ Age = age,
+ CompleteFlag = Convert.ToChar(row["complete_flag"].ToString()),
+ CustomerOrgId = GuidFlag.PersonCustomerOrgId,
+ CustomerOrgRegisterId = GuidFlag.PersonCustomerOrgRegisterId,
+ DeviceId = Guid.Parse(input.DeviceId),
+ GuidePrintTimes = 0,
+ IsAudit = 'N',
+ IsLock = 'N',
+ IsMedicalStart = 'Y',
+ IsNameHide = 'N',
+ IsPhoneFollow = 'N',
+ IsVip = 'N',
+ IsRecoverGuide = 'N',
+ IsUpload = 'N',
+ IsUploadAppoint = 'N',
+ MaritalStatusId = maritalStatusId,
+ MedicalCenterId = Guid.Empty,
+ MedicalTimes = 0,
+ PatientId = patientEnt.Id,
+ PatientName = patientName,
+ ReportPrintTimes = 0,
+ PatientRegisterNo = await _patientRegisterManager.CreatePatientRegisterNo(Guid.Empty),
+ SendFlag = '0',
+ SexId = sexId
+ };
+
+ patientRegisterEnt = await _patientRegisterRepository.InsertAsync(patientRegisterEnt, true);
+
+ tempPatientRegisterId = patientRegisterEnt.Id;
- var isCheckRequestNo = await _registerCheckRepository.FirstOrDefaultAsync(f => f.CheckRequestNo == input.CheckRequestNo);
- if (isCheckRequestNo == null)
- {
- var patientRegisterEnt = new PatientRegister(GuidGenerator.Create())
- {
- Age = age,
- CompleteFlag = Convert.ToChar(row["complete_flag"].ToString()),
- CustomerOrgId = GuidFlag.PersonCustomerOrgId,
- CustomerOrgRegisterId = GuidFlag.PersonCustomerOrgRegisterId,
- DeviceId = Guid.Parse(input.DeviceId),
- GuidePrintTimes = 0,
- IsAudit = 'N',
- IsLock = 'N',
- IsMedicalStart = 'Y',
- IsNameHide = 'N',
- IsPhoneFollow = 'N',
- IsVip = 'N',
- IsRecoverGuide = 'N',
- IsUpload = 'N',
- IsUploadAppoint = 'N',
- MaritalStatusId = maritalStatusId,
- MedicalCenterId = Guid.Empty,
- MedicalTimes = 0,
- PatientId = patientEnt.Id,
- PatientName = patientName,
- ReportPrintTimes = 0,
- PatientRegisterNo = await _patientRegisterManager.CreatePatientRegisterNo(Guid.Empty),
- SendFlag = '0',
- SexId = sexId
- };
-
- patientRegisterEnt = await _patientRegisterRepository.InsertAsync(patientRegisterEnt, true);
-
- patientRegisterId = patientRegisterEnt.Id;
- }
- else
- {
- patientRegisterId = isCheckRequestNo.PatientRegisterId;
- }
+ #endregion
- #endregion
+ }
+ #endregion
+
+ #region 处理项目信息
+ foreach (DataRow row in oldRegisterAsbitemList.Rows)
+ {
+ string oldAsbitemId = row["asbitem_id"].ToString();
+ string oldPatientRegisterId = row["patient_register_id"].ToString();
+
+ if (registerCheckList.Count(c => c.registerCheckAsbitem.OldAsbitemId == oldAsbitemId
+ && c.registerCheckAsbitem.OldPatientRegisterId == oldPatientRegisterId) == 0)
+ {
+ //未登记的项目新增进来
#region 登记项目 明细项目
- string oldAsbitemId = row["asbitem_id"].ToString();
var oldAsbitemPrice = Convert.ToDecimal(row["price"].ToString());
var oldAsbitemStandardPrice = Convert.ToDecimal(row["standard_price"].ToString());
@@ -1248,7 +1353,7 @@ namespace Shentun.Pacs.PacsBusiness
IsLock = 'N',
IsPacsCheck = 'N',
IsSignIn = 'Y',
- PatientRegisterId = patientRegisterId,
+ PatientRegisterId = tempPatientRegisterId,
ScheduledAet = input.ScheduledAet,
WorklistFlag = '1',
WorklistPreCheckDate = DateTime.Now
@@ -1266,7 +1371,7 @@ namespace Shentun.Pacs.PacsBusiness
IsCharge = Convert.ToChar(row["charge_flag"].ToString()),
OldAsbitemId = oldAsbitemId,
OldPatientRegisterId = row["patient_register_id"].ToString(),
- PatientRegisterId = patientRegisterId,
+ PatientRegisterId = tempPatientRegisterId,
PayTypeFlag = Convert.ToChar(row["payment_mode"].ToString()),
RegisterCheckId = registerCheckEnt.Id
};
@@ -1315,25 +1420,18 @@ namespace Shentun.Pacs.PacsBusiness
}
#endregion
-
}
- }
- else
- {
- foreach (var item in registerCheckList)
- {
- item.patientRegister.DeviceId = Guid.Parse(input.DeviceId);
- }
- await _patientRegisterRepository.UpdateManyAsync(registerCheckList.Select(s => s.patientRegister).ToList());
- }
+ }
+ #endregion
+
+ entDto = await _patientRegisterAppService.GetPatientRegisterOrNo(tempPatientRegisterId);
}
else
{
throw new UserFriendlyException("检查条码不正确");
}
-
-
+ return entDto;
}
diff --git a/src/Shentun.Pacs.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Pacs.Application/PatientRegisters/PatientRegisterAppService.cs
index 40985ba..08819d0 100644
--- a/src/Shentun.Pacs.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Pacs.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -3418,7 +3418,10 @@ namespace Shentun.Pacs.PatientRegisters
#region 登记完返回的数据
- private async Task GetPatientRegisterOrNo(Guid PatientRegisterId)
+
+
+ [RemoteService(false)]
+ public async Task GetPatientRegisterOrNo(Guid PatientRegisterId)
{
// var entold = await _repository.GetAsync(PatientRegisterId);
var ent = (await _repository.GetQueryableAsync()).Include(x => x.Patient).Where(m => m.Id == PatientRegisterId).FirstOrDefault();
diff --git a/src/Shentun.Pacs.Application/Worklists/WorklistAppService.cs b/src/Shentun.Pacs.Application/Worklists/WorklistAppService.cs
index d6274a8..c648d5b 100644
--- a/src/Shentun.Pacs.Application/Worklists/WorklistAppService.cs
+++ b/src/Shentun.Pacs.Application/Worklists/WorklistAppService.cs
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Shentun.Pacs.Models;
+using Shentun.Utilities;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -76,38 +77,61 @@ namespace Shentun.Pacs.Worklists
patientRegister,
registerCheck,
deviceType,
- asbitemName = !string.IsNullOrWhiteSpace(asbitem.ShortName) ? asbitem.ShortName : asbitem.DisplayName
+ asbitemName = !string.IsNullOrWhiteSpace(asbitem.ShortName) ? asbitem.ShortName : asbitem.DisplayName,
+ endAsbitemName = !string.IsNullOrWhiteSpace(asbitem.EnglishShortName) ? asbitem.EnglishShortName : asbitem.DisplayName,
+ isFilmRelease = asbitem.IsFilmRelease
}).ToList();
- var entListDto = queryList.GroupBy(g => g.registerCheck.CheckRequestNo).Select(s => new GetWorklistPatientListDto
- {
- DateOfBirth = s.FirstOrDefault().patientRegister.BirthDate != null ? s.FirstOrDefault().patientRegister.BirthDate.Value : DateTime.Now,
- ExamDateAndTime = s.FirstOrDefault().registerCheck.WorklistPreCheckDate != null ? s.FirstOrDefault().registerCheck.WorklistPreCheckDate.Value : DateTime.Now,
- Modality = s.FirstOrDefault().deviceType.DisplayName,
- PatientID = s.FirstOrDefault().registerCheck.CheckRequestNo,
- Forename = s.FirstOrDefault().patientRegister.PatientName,
- ScheduledAET = s.FirstOrDefault().registerCheck.ScheduledAet,
- Sex = s.FirstOrDefault().patientRegister.SexId.ToString(),
- AccessionNumber = "",
- Surname = "",
- ExamDescription = string.Join(",", s.Select(ss => ss.asbitemName).Distinct()),
- ExamRoom = "",
- HospitalName = "",
- PerformingPhysician = "",
- ProcedureID = "",
- ProcedureStepID = "",
- ReferringPhysician = "",
- StudyUID = "",
- Title = ""
- }).ToList();
-
- entListDto.ForEach(f =>
+ var checkRequestNoGroup = queryList.GroupBy(g => g.registerCheck.CheckRequestNo);
+
+ var entListDto = new List();
+
+ foreach (var item in checkRequestNoGroup)
{
- if (f.ExamDescription.Length > 64)
+ string examDescription = string.Join(",", item.Select(ss => ss.asbitemName).Distinct());
+ if (item.Where(m => m.isFilmRelease == 'N').Count() > 0)
+ {
+ examDescription += ",不出片";
+ }
+
+ if (examDescription.Length > 64)
{
- f.ExamDescription = f.ExamDescription.Substring(0, 64);
+ examDescription = examDescription.Substring(0, 64);
}
- });
+
+ string examEngDescription = string.Join(",", item.Select(ss => ss.isFilmRelease == 'N' ? ss.endAsbitemName + "(BU)" : ss.endAsbitemName).Distinct());
+
+ if (examEngDescription.Length > 64)
+ {
+ examEngDescription = examEngDescription.Substring(0, 64);
+ }
+
+
+ entListDto.Add(new GetWorklistPatientListDto
+ {
+ DateOfBirth = item.FirstOrDefault().patientRegister.BirthDate != null ? item.FirstOrDefault().patientRegister.BirthDate.Value : DateTime.Now,
+ ExamDateAndTime = item.FirstOrDefault().registerCheck.WorklistPreCheckDate != null ? item.FirstOrDefault().registerCheck.WorklistPreCheckDate.Value : DateTime.Now,
+ Modality = item.FirstOrDefault().deviceType.DisplayName,
+ PatientID = item.FirstOrDefault().registerCheck.CheckRequestNo,
+ Forename = item.FirstOrDefault().patientRegister.PatientName,
+ PYForename = LanguageConverter.GetPYAllName(item.FirstOrDefault().patientRegister.PatientName),
+ ScheduledAET = item.FirstOrDefault().registerCheck.ScheduledAet,
+ Sex = item.FirstOrDefault().patientRegister.SexId.ToString(),
+ AccessionNumber = "",
+ Surname = "",
+ ExamDescription = examDescription,
+ ExamEngDescription = examEngDescription,
+ ExamRoom = "",
+ HospitalName = "",
+ PerformingPhysician = "",
+ ProcedureID = "",
+ ProcedureStepID = "",
+ ReferringPhysician = "",
+ StudyUID = "",
+ Title = ""
+ });
+ }
+
return entListDto;
}
diff --git a/src/Shentun.Pacs.Domain/Asbitems/Asbitem.cs b/src/Shentun.Pacs.Domain/Asbitems/Asbitem.cs
index 98a7e57..b0130e0 100644
--- a/src/Shentun.Pacs.Domain/Asbitems/Asbitem.cs
+++ b/src/Shentun.Pacs.Domain/Asbitems/Asbitem.cs
@@ -224,6 +224,21 @@ namespace Shentun.Pacs.Models
[Column("is_privacy")]
public char IsPrivacy { get; set; }
+
+ ///
+ /// 是否出片
+ ///
+ [Column("is_film_release")]
+ public char IsFilmRelease { get; set; }
+
+ ///
+ /// 英文简称
+ ///
+ [Column("english_short_name")]
+ [StringLength(50)]
+ public string EnglishShortName { get; set; }
+
+
[Column("concurrency_stamp")]
public string ConcurrencyStamp { get; set; }
diff --git a/src/Shentun.Pacs.Domain/Asbitems/AsbitemManager.cs b/src/Shentun.Pacs.Domain/Asbitems/AsbitemManager.cs
index 928fbff..e18ddaf 100644
--- a/src/Shentun.Pacs.Domain/Asbitems/AsbitemManager.cs
+++ b/src/Shentun.Pacs.Domain/Asbitems/AsbitemManager.cs
@@ -113,7 +113,9 @@ namespace Shentun.Pacs.Asbitems
IsFollowUpFunction = entity.IsFollowUpFunction,
CriticalValueFunction = entity.CriticalValueFunction,
FollowUpFunction = entity.FollowUpFunction,
- IsPrivacy = entity.IsPrivacy
+ IsPrivacy = entity.IsPrivacy,
+ IsFilmRelease = entity.IsFilmRelease,
+ EnglishShortName = entity.EnglishShortName
};
}
///
@@ -167,6 +169,8 @@ namespace Shentun.Pacs.Asbitems
targetEntity.CriticalValueFunction = sourceEntity.CriticalValueFunction;
targetEntity.FollowUpFunction = sourceEntity.FollowUpFunction;
targetEntity.IsPrivacy = sourceEntity.IsPrivacy;
+ targetEntity.IsFilmRelease = sourceEntity.IsFilmRelease;
+ targetEntity.EnglishShortName = sourceEntity.EnglishShortName;
}
diff --git a/src/Shentun.Pacs.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs b/src/Shentun.Pacs.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
index d95fee9..e021c4f 100644
--- a/src/Shentun.Pacs.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
+++ b/src/Shentun.Pacs.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
@@ -43,7 +43,9 @@ namespace Shentun.Pacs.DbMapping
entity.Property(t => t.IsFollowUpFunction).HasComment("是否启用随访函数").IsRequired().HasDefaultValueSql("'N'");
entity.Property(t => t.FollowUpFunction).HasComment("随访函数");
entity.Property(t => t.IsPrivacy).HasComment("是否隐私项目").IsRequired().HasDefaultValueSql("'N'");
-
+ entity.Property(t => t.IsFilmRelease).HasComment("是否出片").IsRequired().HasDefaultValueSql("'N'");
+ entity.Property(t => t.EnglishShortName).HasComment("英文简称");
+
entity.Property(e => e.Id)
.IsFixedLength()
.HasComment("编号").HasColumnName("id");
diff --git a/src/Shentun.Pacs.EntityFrameworkCore/Migrations/20241220014728_update_asbitem_add_is_film_release.Designer.cs b/src/Shentun.Pacs.EntityFrameworkCore/Migrations/20241220014728_update_asbitem_add_is_film_release.Designer.cs
new file mode 100644
index 0000000..d8c92bb
--- /dev/null
+++ b/src/Shentun.Pacs.EntityFrameworkCore/Migrations/20241220014728_update_asbitem_add_is_film_release.Designer.cs
@@ -0,0 +1,16279 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Shentun.Pacs.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Shentun.Pacs.Migrations
+{
+ [DbContext(typeof(PeisDbContext))]
+ [Migration("20241220014728_update_asbitem_add_is_film_release")]
+ partial class update_asbitem_add_is_film_release
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+ .HasAnnotation("ProductVersion", "6.0.5")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("Shentun.Pacs.Books.HelloA", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("ADesc")
+ .HasColumnType("text")
+ .HasColumnName("a_desc");
+
+ b.Property("AName")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("text")
+ .HasDefaultValue("默认值")
+ .HasColumnName("a_name");
+
+ b.Property("AddTime")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("add_time")
+ .HasDefaultValueSql("now()");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("HelloTypeId")
+ .HasColumnType("text")
+ .HasColumnName("hello_type_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("S2")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("character(1)")
+ .HasDefaultValueSql("'A'::bpchar");
+
+ b.HasKey("Id");
+
+ b.HasIndex(new[] { "AName" }, "ix_helloa")
+ .IsUnique();
+
+ b.ToTable("hello_a");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.HelloType", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("TypeName")
+ .HasMaxLength(10)
+ .HasColumnType("character varying(10)")
+ .HasColumnName("type_name")
+ .HasComment("类型名称");
+
+ b.Property("s1")
+ .HasColumnType("uuid")
+ .HasColumnName("s1");
+
+ b.Property("s2")
+ .HasColumnType("uuid")
+ .HasColumnName("s2");
+
+ b.Property("s3")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("s3");
+
+ b.HasKey("Id");
+
+ b.ToTable("hello_type");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.Ma", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text")
+ .HasColumnName("id");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.HasKey("Id");
+
+ b.ToTable("ma");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.Mb", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text")
+ .HasColumnName("id");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("MaId")
+ .HasColumnType("text")
+ .HasColumnName("ma_id");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaId");
+
+ b.ToTable("mb");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.Mc", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text")
+ .HasColumnName("id");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("MbId")
+ .HasColumnType("text")
+ .HasColumnName("mb_id");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MbId");
+
+ b.ToTable("mc");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.Student", b =>
+ {
+ b.Property("Sid")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("sid");
+
+ b.Property("Cid")
+ .HasColumnType("text");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uuid")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uuid")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("DeletionTime");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("boolean")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uuid")
+ .HasColumnName("LastModifierId");
+
+ b.Property("Name")
+ .HasColumnType("text");
+
+ b.Property("Uid")
+ .HasColumnType("uuid");
+
+ b.HasKey("Sid");
+
+ b.ToTable("student");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.TestA", b =>
+ {
+ b.Property("AId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .IsFixedLength()
+ .HasComment("编号");
+
+ b.Property("AName")
+ .HasColumnType("text");
+
+ b.HasKey("AId");
+
+ b.ToTable("testa");
+
+ b.HasComment("组合项目");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.TestB", b =>
+ {
+ b.Property("BId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid");
+
+ b.Property("AId")
+ .HasColumnType("uuid")
+ .IsFixedLength()
+ .HasComment("编号");
+
+ b.Property("AName")
+ .HasColumnType("text");
+
+ b.Property("TestAsAId")
+ .HasColumnType("uuid");
+
+ b.HasKey("BId");
+
+ b.HasIndex("TestAsAId");
+
+ b.ToTable("testb");
+
+ b.HasComment("组合项目");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Books.TestCT", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("TName")
+ .HasColumnType("text")
+ .HasColumnName("t_name");
+
+ b.HasKey("Id");
+
+ b.ToTable("test_ct");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.AbpUserDepartment", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("uuid")
+ .HasColumnName("user_id");
+
+ b.Property("OrganizationUnitId")
+ .HasColumnType("uuid")
+ .HasColumnName("organization_unit_id");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.HasKey("UserId", "OrganizationUnitId")
+ .HasName("pk_user_organizationunitid");
+
+ b.ToTable("abp_user_department");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.Asbitem", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength()
+ .HasComment("编号");
+
+ b.Property("BarcodeMode")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("barcode_mode")
+ .HasDefaultValueSql("'0'")
+ .HasComment("条码模式");
+
+ b.Property("ClinicalMeaning")
+ .HasMaxLength(100)
+ .HasColumnType("character varying(100)")
+ .HasColumnName("clinical_meaning")
+ .HasComment("临床意义");
+
+ b.Property("CollectItemTypeId")
+ .HasColumnType("uuid")
+ .HasColumnName("collect_item_type_id")
+ .IsFixedLength()
+ .HasComment("汇总项目类别");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("CriticalValueFunction")
+ .HasColumnType("text")
+ .HasColumnName("critical_value_function")
+ .HasComment("危急值函数");
+
+ b.Property("DefaultResult")
+ .HasMaxLength(100)
+ .HasColumnType("character varying(100)")
+ .HasColumnName("default_result")
+ .HasComment("默认结果");
+
+ b.Property("DeviceTypeId")
+ .HasColumnType("uuid")
+ .HasColumnName("device_type_id")
+ .HasComment("仪器类别");
+
+ b.Property("DiagnosisFunction")
+ .HasMaxLength(4000)
+ .HasColumnType("character varying(4000)")
+ .HasColumnName("diagnosis_function")
+ .HasComment("诊断函数");
+
+ b.Property("DiseaseScreeningTypeId")
+ .HasColumnType("uuid")
+ .HasColumnName("disease_screening_type_id");
+
+ b.Property("DisplayName")
+ .IsRequired()
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)")
+ .HasColumnName("display_name")
+ .HasComment("名称");
+
+ b.Property("DisplayOrder")
+ .HasColumnType("integer")
+ .HasColumnName("display_order");
+
+ b.Property("FollowUpFunction")
+ .HasColumnType("text")
+ .HasColumnName("follow_up_function")
+ .HasComment("随访函数");
+
+ b.Property("ForPregnantFlag")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("for_pregnant_flag")
+ .HasDefaultValueSql("'A'")
+ .HasComment("备怀孕期间禁止检查");
+
+ b.Property("ForSexId")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("for_sex_id")
+ .HasDefaultValueSql("'A'")
+ .HasComment("适用性别,M-男,F-女,A-全部");
+
+ b.Property("IsActive")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_active")
+ .HasDefaultValueSql("'Y'")
+ .HasComment("是启用");
+
+ b.Property("IsBeforeEat")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_before_eat")
+ .HasDefaultValueSql("'N'")
+ .HasComment("餐前项目");
+
+ b.Property("IsCheck")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_check")
+ .HasDefaultValueSql("'Y'")
+ .HasComment("是检查项目");
+
+ b.Property("IsContinueProcess")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_continue_process")
+ .HasDefaultValueSql("'N'")
+ .HasComment("诊断函数处理完毕后继续处理");
+
+ b.Property("IsCriticalValueFunction")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_critical_value_function")
+ .HasDefaultValueSql("'N'")
+ .HasComment("是否启用危急值函数");
+
+ b.Property("IsDiagnosisFunction")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_diagnosis_function")
+ .HasDefaultValueSql("'N'")
+ .HasComment("启用诊断函数");
+
+ b.Property("IsFilmRelease")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("character(1)")
+ .HasColumnName("is_film_release")
+ .HasDefaultValueSql("'N'")
+ .HasComment("是否出片");
+
+ b.Property("IsFollowUpFunction")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_follow_up_function")
+ .HasDefaultValueSql("'N'")
+ .HasComment("是否启用随访函数");
+
+ b.Property("IsItemResultMerger")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_item_result_merger")
+ .HasDefaultValueSql("'N'")
+ .HasComment("项目结果合并");
+
+ b.Property("IsPictureRotate")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_picture_rotate")
+ .HasDefaultValueSql("'N'")
+ .HasComment("体检报告图片旋转90°");
+
+ b.Property("IsPrivacy")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("character(1)")
+ .HasColumnName("is_privacy")
+ .HasDefaultValueSql("'N'")
+ .HasComment("是否隐私项目");
+
+ b.Property("IsWebAppoint")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_web_appoint")
+ .HasDefaultValueSql("'Y'")
+ .HasComment("是否支持网上预约");
+
+ b.Property("ItemTypeId")
+ .HasColumnType("uuid")
+ .HasColumnName("item_type_id")
+ .IsFixedLength()
+ .HasComment("项目类别");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("MaritalStatusId")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("marital_status_id")
+ .HasDefaultValueSql("'A'")
+ .HasComment("适用婚姻状况,0-未婚,1-已婚,A-全部");
+
+ b.Property("Price")
+ .ValueGeneratedOnAdd()
+ .HasPrecision(8, 2)
+ .HasColumnType("numeric(8,2)")
+ .HasColumnName("price")
+ .HasDefaultValueSql("0")
+ .HasComment("价格");
+
+ b.Property("QueueTime")
+ .ValueGeneratedOnAdd()
+ .HasPrecision(3, 1)
+ .HasColumnType("numeric(3,1)")
+ .HasColumnName("queue_time")
+ .HasDefaultValueSql("0")
+ .HasComment("候诊时间");
+
+ b.Property("ShortName")
+ .HasMaxLength(20)
+ .HasColumnType("character varying(20)")
+ .HasColumnName("short_name")
+ .HasComment("简称");
+
+ b.Property("SimpleCode")
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)")
+ .HasColumnName("simple_code");
+
+ b.Property("Warn")
+ .HasMaxLength(100)
+ .HasColumnType("character varying(100)")
+ .HasColumnName("warn");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CollectItemTypeId");
+
+ b.HasIndex("ItemTypeId");
+
+ b.HasIndex(new[] { "DisplayName" }, "ix_asbitem")
+ .IsUnique();
+
+ b.ToTable("asbitem");
+
+ b.HasComment("组合项目");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.AsbitemDetail", b =>
+ {
+ b.Property("AsbitemId")
+ .HasColumnType("uuid")
+ .HasColumnName("asbitem_id")
+ .IsFixedLength();
+
+ b.Property("ItemId")
+ .HasColumnType("uuid")
+ .HasColumnName("item_id")
+ .IsFixedLength()
+ .HasComment("项目编码");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.HasKey("AsbitemId", "ItemId")
+ .HasName("pk_department_asbitem_detail");
+
+ b.HasIndex("ItemId");
+
+ b.ToTable("asbitem_detail");
+
+ b.HasComment("组合项目包含项目");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.AsbitemGuide", b =>
+ {
+ b.Property("MedicalCenterId")
+ .HasColumnType("uuid")
+ .HasColumnName("medical_center_id")
+ .IsFixedLength()
+ .HasComment("单位科室ID");
+
+ b.Property("AsbitemId")
+ .HasColumnType("uuid")
+ .HasColumnName("asbitem_id")
+ .IsFixedLength()
+ .HasComment("组合项目ID");
+
+ b.Property("ForSexId")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("for_sex_id")
+ .HasDefaultValueSql("'A'")
+ .HasComment("适用性别ID");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("Guide")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("guide")
+ .HasComment("指引单内容");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.HasKey("MedicalCenterId", "AsbitemId", "ForSexId")
+ .HasName("pk_department_asbitem_guide");
+
+ b.ToTable("asbitem_guide");
+
+ b.HasComment("体检中心组和项目指引内容");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.AsbitemPriceItem", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength();
+
+ b.Property("Amount")
+ .IsRequired()
+ .ValueGeneratedOnAdd()
+ .HasColumnType("smallint")
+ .HasColumnName("amount")
+ .HasDefaultValueSql("0")
+ .HasComment("数量");
+
+ b.Property("AsbitemId")
+ .HasColumnType("uuid")
+ .HasColumnName("asbitem_id")
+ .IsFixedLength()
+ .HasComment("组合项目编号");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("PriceItemId")
+ .HasColumnType("uuid")
+ .HasColumnName("price_item_id")
+ .IsFixedLength()
+ .HasComment("价表项目编码");
+
+ b.HasKey("Id");
+
+ b.ToTable("asbitem_price_item");
+
+ b.HasComment("组和项目包含价表项目");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.BigtextResultConclusion", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength();
+
+ b.Property("BigtextResultTemplateId")
+ .HasColumnType("uuid")
+ .HasColumnName("bigtext_result_template_id")
+ .IsFixedLength();
+
+ b.Property("Conclusion")
+ .HasMaxLength(200)
+ .HasColumnType("character varying(200)")
+ .HasColumnName("conclusion")
+ .HasComment("结论");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("DisplayOrder")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("display_order")
+ .HasDefaultValueSql("999999");
+
+ b.Property("IsAbnormal")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_abnormal")
+ .HasDefaultValueSql("'Y'")
+ .HasComment("是否为异常结论");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BigtextResultTemplateId");
+
+ b.ToTable("bigtext_result_conclusion");
+
+ b.HasComment("大文本结果结论");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.BigtextResultDescription", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength();
+
+ b.Property("BigtextResultTemplateId")
+ .HasColumnType("uuid")
+ .HasColumnName("bigtext_result_template_id")
+ .IsFixedLength();
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("Description")
+ .HasMaxLength(2000)
+ .HasColumnType("character varying(2000)")
+ .HasColumnName("description")
+ .HasComment("描述");
+
+ b.Property("DisplayOrder")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("display_order")
+ .HasDefaultValueSql("999999");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BigtextResultTemplateId");
+
+ b.ToTable("bigtext_result_description");
+
+ b.HasComment("大文本结果描述");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.BigtextResultTemplate", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength();
+
+ b.Property("BigtextResultTypeId")
+ .HasColumnType("uuid")
+ .HasColumnName("bigtext_result_type_id")
+ .IsFixedLength()
+ .HasComment("结果类别编号");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("DisplayName")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("display_name")
+ .HasComment("名称");
+
+ b.Property("DisplayOrder")
+ .HasColumnType("integer")
+ .HasColumnName("display_order");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("SimpleCode")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("simple_code");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BigtextResultTypeId");
+
+ b.ToTable("bigtext_result_template");
+
+ b.HasComment("大文本结果模板");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.BigtextResultType", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength();
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("DisplayName")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("display_name")
+ .HasComment("名称");
+
+ b.Property("DisplayOrder")
+ .HasColumnType("integer")
+ .HasColumnName("display_order");
+
+ b.Property("ItemTypeId")
+ .HasColumnType("uuid")
+ .HasColumnName("item_type_id")
+ .IsFixedLength()
+ .HasComment("项目类别");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("ParentId")
+ .HasColumnType("uuid")
+ .HasColumnName("parent_id")
+ .IsFixedLength()
+ .HasComment("父编号");
+
+ b.Property("PathCode")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("path_code")
+ .HasComment("路径编码");
+
+ b.Property("SimpleCode")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("simple_code");
+
+ b.HasKey("Id");
+
+ b.ToTable("bigtext_result_type");
+
+ b.HasComment("大文本结果类别");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.BirthPlace", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength();
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CountryCode")
+ .IsRequired()
+ .HasMaxLength(6)
+ .HasColumnType("character varying(6)")
+ .HasColumnName("country_code")
+ .HasComment("国家标准码");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("DisplayName")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("display_name");
+
+ b.Property("DisplayOrder")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("display_order")
+ .HasDefaultValueSql("999999");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("SimpleCode")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("simple_code");
+
+ b.HasKey("Id");
+
+ b.HasIndex(new[] { "DisplayName" }, "ix_birth_place")
+ .IsUnique();
+
+ b.ToTable("birth_place");
+
+ b.HasComment("出生地");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.CardBill", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .HasComment("编号");
+
+ b.Property("BillFlag")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("bill_flag")
+ .HasDefaultValueSql("'0'::bpchar")
+ .HasComment("记账标志");
+
+ b.Property("BillMoney")
+ .HasPrecision(10, 2)
+ .HasColumnType("numeric(10,2)")
+ .HasColumnName("bill_money")
+ .HasComment("记账金额");
+
+ b.Property("CardRegisterId")
+ .HasColumnType("uuid")
+ .HasColumnName("card_register_id")
+ .HasComment("卡登记编号");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("PayModeId")
+ .IsRequired()
+ .HasMaxLength(4)
+ .HasColumnType("character varying(4)")
+ .HasColumnName("pay_mode_id")
+ .HasComment("支付方式");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CardRegisterId");
+
+ b.HasIndex("PayModeId");
+
+ b.ToTable("card_bill");
+
+ b.HasComment("卡记账记录");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.CardRegister", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .HasComment("编号");
+
+ b.Property("CardBalance")
+ .HasPrecision(10, 2)
+ .HasColumnType("numeric(10,2)")
+ .HasColumnName("card_balance");
+
+ b.Property("CardNo")
+ .IsRequired()
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)")
+ .HasColumnName("card_no")
+ .HasComment("卡号");
+
+ b.Property("CardPassword")
+ .HasMaxLength(10)
+ .HasColumnType("character varying(10)")
+ .HasColumnName("card_password");
+
+ b.Property("CardTypeId")
+ .HasColumnType("uuid")
+ .HasColumnName("card_type_id")
+ .IsFixedLength()
+ .HasComment("卡类型");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("CustomerName")
+ .HasMaxLength(20)
+ .HasColumnType("character varying(20)")
+ .HasColumnName("customer_name")
+ .HasComment("领用者");
+
+ b.Property("Discount")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("discount")
+ .HasDefaultValueSql("100")
+ .HasComment("折扣");
+
+ b.Property("ExpiryDate")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("expiry_date")
+ .HasComment("有效期");
+
+ b.Property("IdNo")
+ .IsRequired()
+ .HasMaxLength(18)
+ .HasColumnType("character varying(18)")
+ .HasColumnName("id_no")
+ .HasComment("身份证号");
+
+ b.Property("IsActive")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_active")
+ .HasDefaultValueSql("0")
+ .HasComment("使用标志");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("MedicalCenterId")
+ .HasColumnType("uuid")
+ .HasColumnName("medical_center_id");
+
+ b.Property("MobileTelephone")
+ .IsRequired()
+ .HasMaxLength(20)
+ .HasColumnType("character varying(20)")
+ .HasColumnName("mobile_telephone")
+ .HasComment("手机");
+
+ b.Property("Remark")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("remark")
+ .HasComment("备注");
+
+ b.Property("Telephone")
+ .HasMaxLength(20)
+ .HasColumnType("character varying(20)")
+ .HasColumnName("telephone")
+ .HasComment("电话");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CardTypeId");
+
+ b.HasIndex(new[] { "CardNo", "IsActive" }, "ix_card_register")
+ .IsUnique();
+
+ b.ToTable("card_register");
+
+ b.HasComment("会员卡登记");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.CardType", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength()
+ .HasComment("编号");
+
+ b.Property("CardModeId")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("card_mode_id")
+ .HasDefaultValueSql("0")
+ .HasComment("卡模式");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("Discount")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("discount")
+ .HasDefaultValueSql("100")
+ .HasComment("折扣");
+
+ b.Property("DisplayName")
+ .IsRequired()
+ .HasMaxLength(20)
+ .HasColumnType("character varying(20)")
+ .HasColumnName("display_name")
+ .HasComment("名称");
+
+ b.Property("DisplayOrder")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("display_order")
+ .HasDefaultValueSql("999999")
+ .HasComment("显示顺序");
+
+ b.Property("ExpiryDay")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("expiry_day")
+ .HasDefaultValueSql("3650")
+ .HasComment("有效期");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("Remark")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("remark")
+ .HasComment("备注");
+
+ b.HasKey("Id");
+
+ b.ToTable("card_type");
+
+ b.HasComment("会员卡类别");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.Charge", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .HasComment("收据号");
+
+ b.Property("ChargeFlag")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("charge_flag")
+ .HasDefaultValueSql("0");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("character varying(40)")
+ .HasColumnName("concurrency_stamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("creation_time");
+
+ b.Property("CreatorId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("creator_id");
+
+ b.Property("InvoiceNo")
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)")
+ .HasColumnName("invoice_no");
+
+ b.Property("InvoiceOrgName")
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)")
+ .HasColumnName("invoice_org_name");
+
+ b.Property("LastModificationTime")
+ .IsRequired()
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("last_modification_time");
+
+ b.Property("LastModifierId")
+ .IsRequired()
+ .HasColumnType("uuid")
+ .HasColumnName("last_modifier_id");
+
+ b.Property("PatientRegisterId")
+ .HasColumnType("uuid")
+ .HasColumnName("patient_register_id")
+ .HasComment("登记流水号");
+
+ b.Property("SettleAccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("settle_account_id");
+
+ b.Property("SettleTime")
+ .HasColumnType("timestamp without time zone")
+ .HasColumnName("settle_time");
+
+ b.HasKey("Id");
+
+ b.HasIndex(new[] { "PatientRegisterId" }, "fki_fk_patient_register_charge");
+
+ b.HasIndex(new[] { "PatientRegisterId" }, "ix_charge");
+
+ b.ToTable("charge");
+
+ b.HasComment("收费主档");
+ });
+
+ modelBuilder.Entity("Shentun.Pacs.Models.ChargeAsbitem", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("Amount")
+ .HasColumnType("smallint")
+ .HasColumnName("amount");
+
+ b.Property("AsbitemId")
+ .HasColumnType("uuid")
+ .HasColumnName("asbitem_id")
+ .IsFixedLength()
+ .HasComment("组合项目");
+
+ b.Property