diff --git a/src/Shentun.Peis.Application.Contracts/MedicalConclusions/MedicalConclusionDto.cs b/src/Shentun.Peis.Application.Contracts/MedicalConclusions/MedicalConclusionDto.cs
index d2bbb67..e6c6a8b 100644
--- a/src/Shentun.Peis.Application.Contracts/MedicalConclusions/MedicalConclusionDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/MedicalConclusions/MedicalConclusionDto.cs
@@ -14,6 +14,11 @@ namespace Shentun.Peis.MedicalConclusions
///
public string MedicalConclusionTypeId { get; set; }
+ ///
+ /// 类别名称
+ ///
+ public string MedicalConclusionTypeName { get; set; }
+
public string SimpleCode { get; set; }
public int DisplayOrder { get; set; }
diff --git a/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs b/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs
index 38ec288..345f9fa 100644
--- a/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs
@@ -258,6 +258,76 @@ namespace Shentun.Peis.PatientRegisters
#endregion
+
+ #region 人员登记扩展信息
+
+ ///
+ /// 0-高原 1-健康
+ ///
+ public char? QztlType { get; set; }
+
+ ///
+ /// 扩展
+ ///
+ public char? QztlIsCw { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public char? QztlIsCy { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public char? QztlIsGt { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public char? QztlIsMain { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public char? QztlIsWh { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public char? QztlIsFj { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public char? IsQztlImport { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public char? UploadQztlFlag { get; set; } = 'N';
+
+ ///
+ /// 扩展
+ ///
+ public string Planuserid { get; set; }
+
+ ///
+ /// 扩展
+ ///
+ public string Remark2 { get; set; }
+
+ ///
+ /// 扩展
+ ///
+ public string Remark3 { get; set; }
+
+ ///
+ /// 扩展
+ ///
+ public string Remark4 { get; set; }
+
+ #endregion
+
public List RegisterCheckAsbitems { get; set; }
}
diff --git a/src/Shentun.Peis.Application.Contracts/SumSuggestionHeaders/SumSuggestionDto.cs b/src/Shentun.Peis.Application.Contracts/SumSuggestionHeaders/SumSuggestionDto.cs
index 2c0c820..f92c436 100644
--- a/src/Shentun.Peis.Application.Contracts/SumSuggestionHeaders/SumSuggestionDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/SumSuggestionHeaders/SumSuggestionDto.cs
@@ -20,6 +20,11 @@ namespace Shentun.Peis.SumSuggestionHeaders
///
public List DiagnosisIds { get; set; }
+ ///
+ /// 诊断名称列表
+ ///
+ public List DiagnosisNames { get; set; }
+
///
/// 排序值
///
diff --git a/src/Shentun.Peis.Application/MedicalConclusions/MedicalConclusionAppService.cs b/src/Shentun.Peis.Application/MedicalConclusions/MedicalConclusionAppService.cs
index 8f9e5d7..7a271db 100644
--- a/src/Shentun.Peis.Application/MedicalConclusions/MedicalConclusionAppService.cs
+++ b/src/Shentun.Peis.Application/MedicalConclusions/MedicalConclusionAppService.cs
@@ -35,16 +35,19 @@ namespace Shentun.Peis.MedicalConclusions
private readonly IRepository _userRepository;
private readonly MedicalConclusionManager _manager;
private readonly CacheService _cacheService;
+ private readonly IRepository _medicalConclusionTypeRepository;
public MedicalConclusionAppService(
IRepository repository,
IRepository userRepository,
MedicalConclusionManager manager,
- CacheService cacheService)
+ CacheService cacheService,
+ IRepository medicalConclusionTypeRepository)
: base(repository)
{
_userRepository = userRepository;
_manager = manager;
_cacheService = cacheService;
+ _medicalConclusionTypeRepository = medicalConclusionTypeRepository;
}
///
/// 获取通过主键
@@ -70,28 +73,37 @@ namespace Shentun.Peis.MedicalConclusions
///
public async Task> GetListInTypeAsync(GetListInTypeDto input)
{
- var entlist = await Repository.GetQueryableAsync();
+ var entlist = from medicalConclusion in await Repository.GetQueryableAsync()
+ join medicalConclusionType in await _medicalConclusionTypeRepository.GetQueryableAsync()
+ on medicalConclusion.MedicalConclusionTypeId equals medicalConclusionType.Id into medicalConclusionTypeTemp
+ from medicalConclusionType in medicalConclusionTypeTemp.DefaultIfEmpty()
+ select new
+ {
+ medicalConclusion,
+ MedicalConclusionTypeName = medicalConclusionType != null ? medicalConclusionType.DisplayName : ""
+ };
if (!string.IsNullOrEmpty(input.TypeId))
- entlist = entlist.Where(m => m.MedicalConclusionTypeId == input.TypeId);
+ entlist = entlist.Where(m => m.medicalConclusion.MedicalConclusionTypeId == input.TypeId);
+
-
var entdto = entlist.Select(s => new MedicalConclusionDto
{
- CreationTime = s.CreationTime,
- CreatorId = s.CreatorId,
- DisplayName = s.DisplayName,
- DisplayOrder = s.DisplayOrder,
- Id = s.Id,
- LastModificationTime = s.LastModificationTime,
- LastModifierId = s.LastModifierId,
- SimpleCode = s.SimpleCode,
- MedicalConclusionTypeId = s.MedicalConclusionTypeId,
- CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).Result,
- LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).Result
+ CreationTime = s.medicalConclusion.CreationTime,
+ CreatorId = s.medicalConclusion.CreatorId,
+ DisplayName = s.medicalConclusion.DisplayName,
+ DisplayOrder = s.medicalConclusion.DisplayOrder,
+ Id = s.medicalConclusion.Id,
+ LastModificationTime = s.medicalConclusion.LastModificationTime,
+ LastModifierId = s.medicalConclusion.LastModifierId,
+ SimpleCode = s.medicalConclusion.SimpleCode,
+ MedicalConclusionTypeId = s.medicalConclusion.MedicalConclusionTypeId,
+ MedicalConclusionTypeName = s.MedicalConclusionTypeName,
+ CreatorName = _cacheService.GetSurnameAsync(s.medicalConclusion.CreatorId).Result,
+ LastModifierName = _cacheService.GetSurnameAsync(s.medicalConclusion.LastModifierId).Result
}).OrderBy(m => m.DisplayOrder).ToList();
- return entdto;
+ return entdto;
}
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index cd7ee06..39ca6a6 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -101,11 +101,10 @@ namespace Shentun.Peis.PatientRegisters
private readonly PatientRegisterManager _manager;
private readonly CacheService _cacheService;
private readonly SysParmValueManager _sysParmValueManager;
- private readonly IRepository _patientRegisterRepository;
+ private readonly IRepository _patientRegisterExterRepository;
public PatientRegisterAppService(
IRepository repository,
IRepository patientRepository,
- IRepository patientRegisterRepository,
IRepository userRepository,
IRepository sexRepository,
IRepository birthPlaceRepository,
@@ -146,8 +145,8 @@ namespace Shentun.Peis.PatientRegisters
SumSummaryContentManager sumSummaryContentManager,
SumSuggestionHeaderManager sumSuggestionHeaderManager,
SumSuggestionContentManager sumSuggestionContentManager,
- SysParmValueManager sysParmValueManager
- )
+ SysParmValueManager sysParmValueManager,
+ IRepository patientRegisterExterRepository)
: base(repository)
{
this._repository = repository;
@@ -193,7 +192,7 @@ namespace Shentun.Peis.PatientRegisters
_sumSuggestionHeaderManager = sumSuggestionHeaderManager;
_sumSuggestionContentManager = sumSuggestionContentManager;
_sysParmValueManager = sysParmValueManager;
- _patientRegisterRepository = patientRegisterRepository;
+ _patientRegisterExterRepository = patientRegisterExterRepository;
}
///
/// 获取通过主键
@@ -215,83 +214,84 @@ namespace Shentun.Peis.PatientRegisters
[HttpPost("api/app/patientregister/getinfoorpatient")]
public async Task GetInfoOrPatientAsync(PatientRegisterIdInputDto input)
{
- var ent = (await _repository.GetDbSetAsync()).Include(x => x.Patient).Where(m => m.Id == input.PatientRegisterId).FirstOrDefault();
-
- var entdto = new PatientRegisterOrNoDto();
- if (ent != null)
- {
- //var userList = await _userRepository.GetListAsync();
- //var customerOrgList = await _customerOrgRepository.GetListAsync();
-
- entdto = new PatientRegisterOrNoDto
- {
- HisPatientId = ent.HisPatientId,
- Age = ent.Age,
- AuditDate = DataHelper.ConversionDateToString(ent.AuditDate),
- Id = ent.Id,
- AuditDoctorId = ent.AuditDoctorId,
- BirthDate = DataHelper.ConversionDateToString(ent.BirthDate),
- CompleteFlag = ent.CompleteFlag,
- CreationTime = ent.CreationTime,
- CreatorId = ent.CreatorId,
- CustomerOrgGroupId = ent.CustomerOrgGroupId,
- CustomerOrgId = ent.CustomerOrgId,
- CustomerOrgRegisterId = ent.CustomerOrgRegisterId,
- GuidePrintTimes = ent.GuidePrintTimes,
- InterposeMeasure = ent.InterposeMeasure,
- IsAudit = ent.IsAudit,
- IsLock = ent.IsLock,
- IsMedicalStart = ent.IsMedicalStart,
- IsNameHide = ent.IsNameHide,
- IsPhoneFollow = ent.IsPhoneFollow,
- IsRecoverGuide = ent.IsRecoverGuide,
- IsUpload = ent.IsUpload,
- IsVip = ent.IsVip,
- JobCardNo = ent.JobCardNo,
- JobPost = ent.JobPost,
- JobTitle = ent.JobTitle,
- LastModificationTime = ent.LastModificationTime,
- LastModifierId = ent.LastModifierId,
- MaritalStatusId = ent.MaritalStatusId,
- MedicalCardNo = ent.MedicalCardNo,
- MedicalConclusionId = ent.MedicalConclusionId,
- MedicalPackageId = ent.MedicalPackageId,
- MedicalStartDate = DataHelper.ConversionDateToString(ent.MedicalStartDate),
- MedicalTimes = ent.MedicalTimes,
- MedicalTypeId = ent.MedicalTypeId,
- MedicalCenterId = ent.MedicalCenterId,
- PatientId = ent.PatientId,
- PatientName = ent.PatientName,
- PatientRegisterNo = ent.PatientRegisterNo,
- PersonnelTypeId = ent.PersonnelTypeId,
- Photo = ent.Photo,
- Remark = ent.Remark,
- ReportPrintTimes = ent.ReportPrintTimes,
- Salesman = ent.Salesman,
- SexHormoneTermId = ent.SexHormoneTermId,
- SexId = ent.SexId,
- SummaryDate = DataHelper.ConversionDateToString(ent.SummaryDate),
- SummaryDoctorId = ent.SummaryDoctorId,
- ThirdInfo = ent.ThirdInfo,
- CreatorName = _cacheService.GetSurnameAsync(ent.CreatorId).Result,
- LastModifierName = _cacheService.GetSurnameAsync(ent.LastModifierId).Result,
- Address = ent.Patient.Address, //档案表信息
- BirthPlaceId = ent.Patient.BirthPlaceId,
- DisplayName = ent.Patient.DisplayName,
- Email = ent.Patient.Email,
- IdNo = ent.Patient.IdNo,
- MobileTelephone = ent.Patient.MobileTelephone,
- NationId = ent.Patient.NationId,
- PatientNo = ent.Patient.PatientNo,
- PatientPassword = ent.Patient.PatientPassword,
- PostalCode = ent.Patient.PostalCode,
- Telephone = ent.Patient.Telephone,
- CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(ent.CustomerOrgId).Result,
- CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(ent.CustomerOrgId).Result.Id,
- //CustomerOrgParentName = EntityHelper.GetCustomerOrgParentNameNoSql(customerOrgList, ent.CustomerOrgId)
- };
- }
- return entdto;
+ return await GetPatientRegisterOrNo(input.PatientRegisterId);
+ //var ent = (await _repository.GetQueryableAsync()).Include(x => x.Patient).Where(m => m.Id == input.PatientRegisterId).FirstOrDefault();
+
+ //var entdto = new PatientRegisterOrNoDto();
+ //if (ent != null)
+ //{
+ // //var userList = await _userRepository.GetListAsync();
+ // //var customerOrgList = await _customerOrgRepository.GetListAsync();
+
+ // entdto = new PatientRegisterOrNoDto
+ // {
+ // HisPatientId = ent.HisPatientId,
+ // Age = ent.Age,
+ // AuditDate = DataHelper.ConversionDateToString(ent.AuditDate),
+ // Id = ent.Id,
+ // AuditDoctorId = ent.AuditDoctorId,
+ // BirthDate = DataHelper.ConversionDateToString(ent.BirthDate),
+ // CompleteFlag = ent.CompleteFlag,
+ // CreationTime = ent.CreationTime,
+ // CreatorId = ent.CreatorId,
+ // CustomerOrgGroupId = ent.CustomerOrgGroupId,
+ // CustomerOrgId = ent.CustomerOrgId,
+ // CustomerOrgRegisterId = ent.CustomerOrgRegisterId,
+ // GuidePrintTimes = ent.GuidePrintTimes,
+ // InterposeMeasure = ent.InterposeMeasure,
+ // IsAudit = ent.IsAudit,
+ // IsLock = ent.IsLock,
+ // IsMedicalStart = ent.IsMedicalStart,
+ // IsNameHide = ent.IsNameHide,
+ // IsPhoneFollow = ent.IsPhoneFollow,
+ // IsRecoverGuide = ent.IsRecoverGuide,
+ // IsUpload = ent.IsUpload,
+ // IsVip = ent.IsVip,
+ // JobCardNo = ent.JobCardNo,
+ // JobPost = ent.JobPost,
+ // JobTitle = ent.JobTitle,
+ // LastModificationTime = ent.LastModificationTime,
+ // LastModifierId = ent.LastModifierId,
+ // MaritalStatusId = ent.MaritalStatusId,
+ // MedicalCardNo = ent.MedicalCardNo,
+ // MedicalConclusionId = ent.MedicalConclusionId,
+ // MedicalPackageId = ent.MedicalPackageId,
+ // MedicalStartDate = DataHelper.ConversionDateToString(ent.MedicalStartDate),
+ // MedicalTimes = ent.MedicalTimes,
+ // MedicalTypeId = ent.MedicalTypeId,
+ // MedicalCenterId = ent.MedicalCenterId,
+ // PatientId = ent.PatientId,
+ // PatientName = ent.PatientName,
+ // PatientRegisterNo = ent.PatientRegisterNo,
+ // PersonnelTypeId = ent.PersonnelTypeId,
+ // Photo = ent.Photo,
+ // Remark = ent.Remark,
+ // ReportPrintTimes = ent.ReportPrintTimes,
+ // Salesman = ent.Salesman,
+ // SexHormoneTermId = ent.SexHormoneTermId,
+ // SexId = ent.SexId,
+ // SummaryDate = DataHelper.ConversionDateToString(ent.SummaryDate),
+ // SummaryDoctorId = ent.SummaryDoctorId,
+ // ThirdInfo = ent.ThirdInfo,
+ // CreatorName = _cacheService.GetSurnameAsync(ent.CreatorId).Result,
+ // LastModifierName = _cacheService.GetSurnameAsync(ent.LastModifierId).Result,
+ // Address = ent.Patient.Address, //档案表信息
+ // BirthPlaceId = ent.Patient.BirthPlaceId,
+ // DisplayName = ent.Patient.DisplayName,
+ // Email = ent.Patient.Email,
+ // IdNo = ent.Patient.IdNo,
+ // MobileTelephone = ent.Patient.MobileTelephone,
+ // NationId = ent.Patient.NationId,
+ // PatientNo = ent.Patient.PatientNo,
+ // PatientPassword = ent.Patient.PatientPassword,
+ // PostalCode = ent.Patient.PostalCode,
+ // Telephone = ent.Patient.Telephone,
+ // CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(ent.CustomerOrgId).Result,
+ // CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(ent.CustomerOrgId).Result.Id
+ // //CustomerOrgParentName = EntityHelper.GetCustomerOrgParentNameNoSql(customerOrgList, ent.CustomerOrgId)
+ // };
+ //}
+ //return entdto;
}
///
@@ -1486,7 +1486,7 @@ namespace Shentun.Peis.PatientRegisters
}
}
entity.CompleteFlag = PatientRegisterCompleteFlag.PartCheck;
- var newentity = await _patientRegisterRepository.UpdateAsync(entity);
+ var newentity = await _repository.UpdateAsync(entity);
return ObjectMapper.Map(newentity);
}
///
@@ -1946,7 +1946,7 @@ namespace Shentun.Peis.PatientRegisters
if (CustomerOrgIds.Any())
{
- query = query.Where(m => m.a.CustomerOrgId != null && CustomerOrgIds.Contains(m.a.CustomerOrgId));
+ query = query.Where(m => CustomerOrgIds.Contains(m.a.CustomerOrgId));
}
//体检次数
if (input.CustomerOrgRegisterId != Guid.Empty)
@@ -2538,6 +2538,30 @@ namespace Shentun.Peis.PatientRegisters
}
entdto.RegisterCheckAsbitems = entdto.RegisterCheckAsbitems.OrderByDescending(o => o.IsBelongGroupPackage).
OrderBy(o => o.Id).ToList();
+
+
+ #region 扩展信息
+
+
+ var patientRegisterExterEnt = await _patientRegisterExterRepository.FirstOrDefaultAsync(m => m.PatientRegisterId == PatientRegisterId);
+ if (patientRegisterExterEnt != null)
+ {
+ entdto.QztlIsCw = patientRegisterExterEnt.QztlIsCw;
+ entdto.QztlIsCy = patientRegisterExterEnt.QztlIsCy;
+ entdto.QztlIsFj = patientRegisterExterEnt.QztlIsFj;
+ entdto.QztlIsGt = patientRegisterExterEnt.QztlIsGt;
+ entdto.QztlIsMain = patientRegisterExterEnt.QztlIsMain;
+ entdto.QztlIsWh = patientRegisterExterEnt.QztlIsWh;
+ entdto.QztlType = patientRegisterExterEnt.QztlType;
+ entdto.Remark2 = patientRegisterExterEnt.Remark2;
+ entdto.Remark3 = patientRegisterExterEnt.Remark3;
+ entdto.Remark4 = patientRegisterExterEnt.Remark4;
+ entdto.UploadQztlFlag = patientRegisterExterEnt.UploadQztlFlag;
+ entdto.IsQztlImport = patientRegisterExterEnt.IsQztlImport;
+ entdto.Planuserid = patientRegisterExterEnt.Planuserid;
+ }
+
+ #endregion
}
return entdto;
}
diff --git a/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs b/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
index 84fd7c5..5a58a25 100644
--- a/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
+++ b/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
@@ -92,8 +92,6 @@ namespace Shentun.Peis.RegisterCheckPictures
public async Task UpdateRegisterCheckPictureStatusManyAsync(List input)
{
- //
-
if (!input.Any())
{
throw new UserFriendlyException("请求参数有误");
@@ -107,7 +105,6 @@ namespace Shentun.Peis.RegisterCheckPictures
foreach (var item in input)
{
- //修改
var ent = await _registerCheckPictureRepository.FirstOrDefaultAsync(m => m.Id == item.RegisterCheckPictureId);
if (ent != null)
{
@@ -160,9 +157,7 @@ namespace Shentun.Peis.RegisterCheckPictures
{
throw new UserFriendlyException("体检人员不存在");
}
-
- // string PicName = DateTime.Now.ToString("yyyyMMddHHmmss") + rd.Next(1000, 9999);
-
+
List entlist_insert = new List();
@@ -183,24 +178,33 @@ namespace Shentun.Peis.RegisterCheckPictures
throw new UserFriendlyException("图片数据有误");
}
- var ent = new RegisterCheckPicture
- {
- DisplayOrder = input.PictureBaseStrs.IndexOf(item) + 1,
- IsPrint = 'N',
- PictureFilename = PictureUrl,
- RegisterCheckId = input.RegisterCheckId
- };
+ var ent = await _registerCheckPictureRepository.FirstOrDefaultAsync(m => m.RegisterCheckId == input.RegisterCheckId
+ && m.PictureFilename == PictureUrl);
- entlist_insert.Add(ent);
+ if (ent != null)
+ {
+ ent.PictureFilename = PictureUrl;
+ await _registerCheckPictureRepository.UpdateAsync(ent);
+ }
+ else
+ {
+ ent = new RegisterCheckPicture
+ {
+ DisplayOrder = input.PictureBaseStrs.IndexOf(item) + 1,
+ IsPrint = 'N',
+ PictureFilename = PictureUrl,
+ RegisterCheckId = input.RegisterCheckId
+ };
+
+ await _registerCheckPictureRepository.InsertAsync(ent);
+ }
+
msg.Add(PictureUrl);
}
- if (entlist_insert.Any())
- {
- await _registerCheckPictureRepository.InsertManyAsync(entlist_insert);
- }
+
return msg;
}
diff --git a/src/Shentun.Peis.Application/SumSuggestionHeaders/SumSuggestionHeaderAppService.cs b/src/Shentun.Peis.Application/SumSuggestionHeaders/SumSuggestionHeaderAppService.cs
index 4b2bb5f..fe2c03d 100644
--- a/src/Shentun.Peis.Application/SumSuggestionHeaders/SumSuggestionHeaderAppService.cs
+++ b/src/Shentun.Peis.Application/SumSuggestionHeaders/SumSuggestionHeaderAppService.cs
@@ -76,6 +76,9 @@ namespace Shentun.Peis.SumSuggestionHeaders
join sumDiagnosis in await _sumDiagnosisRepository.GetQueryableAsync()
on new { sumSuggestionHeader.PatientRegisterId, sumSuggestionHeader.Id } equals new { sumDiagnosis.PatientRegisterId, Id = sumDiagnosis.SumSuggestionHeaderId } into bb
from sumDiagnosisHaveEmpty in bb.DefaultIfEmpty()
+ join diagnosis in await _diagnosisRepository.GetQueryableAsync()
+ on sumDiagnosisHaveEmpty.DiagnosisId equals diagnosis.Id into diagnosisTemp
+ from diagnosisHaveEmpty in diagnosisTemp.DefaultIfEmpty()
join sumSuggestionContent in await _sumSuggestionContentRepository.GetQueryableAsync()
on sumSuggestionHeader.Id equals sumSuggestionContent.SumSuggestionHeaderId into cc
from sumSuggestionContentHaveEmpty in cc.DefaultIfEmpty()
@@ -85,6 +88,7 @@ namespace Shentun.Peis.SumSuggestionHeaders
{
sumSuggestionHeader,
sumDiagnosisHaveEmpty,
+ diagnosisHaveEmpty,
sumSuggestionContentHaveEmpty
};
@@ -98,6 +102,7 @@ namespace Shentun.Peis.SumSuggestionHeaders
DisplayOrder = s.FirstOrDefault().sumSuggestionHeader.DisplayOrder,
DiagnosisIds = s.Where(o => o.sumDiagnosisHaveEmpty != null).
Select(x => x.sumDiagnosisHaveEmpty.DiagnosisId).Distinct().ToList(),
+ DiagnosisNames = s.Where(m => m.diagnosisHaveEmpty != null).Select(x => x.diagnosisHaveEmpty.DisplayName).Distinct().ToList(),
MedicalInterpretations = s.Where(m => m.sumSuggestionContentHaveEmpty != null &&
m.sumSuggestionContentHaveEmpty.SuggestionType == SuggestionTypeFlag.MedicalInterpretation).
Select(sa => new SumSuggestionContentData
@@ -156,6 +161,7 @@ namespace Shentun.Peis.SumSuggestionHeaders
SuggestionFlag = null,
DisplayOrder = 0,
DiagnosisIds = new List() { matchDiagnosis.Id },
+ DiagnosisNames = new List() { matchDiagnosis.DisplayName },
MedicalInterpretations = matchDiagnosis.Suggestions.
Where(o => o.SuggestionType == SuggestionTypeFlag.MedicalInterpretation)
.OrderBy(o => o.DisplayOrder)
@@ -199,6 +205,7 @@ namespace Shentun.Peis.SumSuggestionHeaders
SuggestionFlag = null,
DisplayOrder = 0,
DiagnosisIds = null,
+ DiagnosisNames = null
});
}
@@ -207,98 +214,98 @@ namespace Shentun.Peis.SumSuggestionHeaders
}
- ///
- /// 批量插入总诊台建议
- ///
- ///
- ///
- [HttpPost("api/app/sumsuggestionheader/createsumsuggestion")]
- public async Task CreateSumSuggestionAsync(List input)
+ ///
+ /// 批量插入总诊台建议
+ ///
+ ///
+ ///
+ [HttpPost("api/app/sumsuggestionheader/createsumsuggestion")]
+ public async Task CreateSumSuggestionAsync(List input)
+ {
+ throw new UserFriendlyException("禁止使用");
+ if (input.Any())
{
- throw new UserFriendlyException("禁止使用");
- if (input.Any())
- {
- //先删除总诊头跟内容
- await _sumSuggestionHeaderRepository.DeleteAsync(m => m.PatientRegisterId == input.FirstOrDefault().PatientRegisterId, true);
+ //先删除总诊头跟内容
+ await _sumSuggestionHeaderRepository.DeleteAsync(m => m.PatientRegisterId == input.FirstOrDefault().PatientRegisterId, true);
- //删除对应的诊断数据
- await _sumDiagnosisRepository.DeleteAsync(m => m.PatientRegisterId == input.FirstOrDefault().PatientRegisterId, true);
+ //删除对应的诊断数据
+ await _sumDiagnosisRepository.DeleteAsync(m => m.PatientRegisterId == input.FirstOrDefault().PatientRegisterId, true);
- foreach (var item in input)
+ foreach (var item in input)
+ {
+ #region 插入SumSuggestionHeader
+ SumSuggestionHeader sumSuggestionHeaderEnt = new SumSuggestionHeader
{
- #region 插入SumSuggestionHeader
- SumSuggestionHeader sumSuggestionHeaderEnt = new SumSuggestionHeader
- {
- DisplayOrder = input.IndexOf(item) + 1,
- PatientRegisterId = item.PatientRegisterId,
- SuggestionFlag = null,
- SuggestionTitle = item.SuggestionTitle
- };
+ DisplayOrder = input.IndexOf(item) + 1,
+ PatientRegisterId = item.PatientRegisterId,
+ SuggestionFlag = null,
+ SuggestionTitle = item.SuggestionTitle
+ };
- var sumSuggestionHeaderEnt_New = await _sumSuggestionHeaderRepository.InsertAsync(sumSuggestionHeaderEnt, true);
+ var sumSuggestionHeaderEnt_New = await _sumSuggestionHeaderRepository.InsertAsync(sumSuggestionHeaderEnt, true);
+
+ if (sumSuggestionHeaderEnt_New != null)
+ {
- if (sumSuggestionHeaderEnt_New != null)
+ #region 插入SumDiagnosis
+ if (item.DiagnosisId != null && item.DiagnosisId != Guid.Empty)
{
- #region 插入SumDiagnosis
- if (item.DiagnosisId != null && item.DiagnosisId != Guid.Empty)
+ SumDiagnosis sumDiagnosis = new SumDiagnosis
{
+ DiagnosisId = item.DiagnosisId.Value,
+ DisplayOrder = input.IndexOf(item) + 1,
+ PatientRegisterId = item.PatientRegisterId,
+ SumSuggestionHeaderId = sumSuggestionHeaderEnt_New.Id
+ };
- SumDiagnosis sumDiagnosis = new SumDiagnosis
- {
- DiagnosisId = item.DiagnosisId.Value,
- DisplayOrder = input.IndexOf(item) + 1,
- PatientRegisterId = item.PatientRegisterId,
- SumSuggestionHeaderId = sumSuggestionHeaderEnt_New.Id
- };
-
- await _sumDiagnosisRepository.InsertAsync(sumDiagnosis);
- }
- #endregion
+ await _sumDiagnosisRepository.InsertAsync(sumDiagnosis);
+ }
+ #endregion
- #region 插入SumSuggestionContent
- List sumSuggestionContentList = new List();
- foreach (var item2 in item.Details)
+ #region 插入SumSuggestionContent
+ List sumSuggestionContentList = new List();
+ foreach (var item2 in item.Details)
+ {
+ SumSuggestionContent sumSuggestionContentEnt = new SumSuggestionContent
{
- SumSuggestionContent sumSuggestionContentEnt = new SumSuggestionContent
- {
- DisplayOrder = item.Details.IndexOf(item2) + 1,
- SuggestionContent = item2.SuggestionContent,
- SumSuggestionHeaderId = sumSuggestionHeaderEnt_New.Id
- };
-
- sumSuggestionContentList.Add(sumSuggestionContentEnt);
- }
+ DisplayOrder = item.Details.IndexOf(item2) + 1,
+ SuggestionContent = item2.SuggestionContent,
+ SumSuggestionHeaderId = sumSuggestionHeaderEnt_New.Id
+ };
- await _sumSuggestionContentRepository.InsertManyAsync(sumSuggestionContentList);
- #endregion
+ sumSuggestionContentList.Add(sumSuggestionContentEnt);
}
+
+ await _sumSuggestionContentRepository.InsertManyAsync(sumSuggestionContentList);
#endregion
}
+ #endregion
}
}
+ }
- ///
- /// 清空总诊台建议内容
- ///
- ///
- ///
- [HttpPost("api/app/sumsuggestionheader/deletesumsuggestionmany")]
- public async Task DeleteSumSuggestionManyAsync(Guid PatientRegisterId)
+ ///
+ /// 清空总诊台建议内容
+ ///
+ ///
+ ///
+ [HttpPost("api/app/sumsuggestionheader/deletesumsuggestionmany")]
+ public async Task DeleteSumSuggestionManyAsync(Guid PatientRegisterId)
+ {
+ if (PatientRegisterId != Guid.Empty)
{
- if (PatientRegisterId != Guid.Empty)
- {
- await _sumSuggestionHeaderRepository.DeleteAsync(d => d.PatientRegisterId == PatientRegisterId);
- //删除对应的诊断数据
- await _sumDiagnosisRepository.DeleteAsync(m => m.PatientRegisterId == PatientRegisterId);
- }
- else
- {
- throw new UserFriendlyException("请求参数有误");
- }
+ await _sumSuggestionHeaderRepository.DeleteAsync(d => d.PatientRegisterId == PatientRegisterId);
+ //删除对应的诊断数据
+ await _sumDiagnosisRepository.DeleteAsync(m => m.PatientRegisterId == PatientRegisterId);
+ }
+ else
+ {
+ throw new UserFriendlyException("请求参数有误");
}
}
}
+}
diff --git a/src/Shentun.Peis.Domain/PatientRegisterExters/PatientRegisterExter.cs b/src/Shentun.Peis.Domain/PatientRegisterExters/PatientRegisterExter.cs
new file mode 100644
index 0000000..67c018b
--- /dev/null
+++ b/src/Shentun.Peis.Domain/PatientRegisterExters/PatientRegisterExter.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace Shentun.Peis.Models
+{
+ ///
+ ///
+ ///
+ [Table("patient_register_exter")]
+ public class PatientRegisterExter : Entity, IHasConcurrencyStamp
+ {
+
+ ///
+ /// 人员登记ID
+ ///
+ [Key]
+ [Column("patient_register_id")]
+ public Guid PatientRegisterId { get; set; }
+
+ [Column("qztl_type")]
+ public char? QztlType { get; set; }
+
+ [Column("qztl_is_cw")]
+ public char? QztlIsCw { get; set; }
+
+ [Column("qztl_is_cy")]
+ public char? QztlIsCy { get; set; }
+
+ [Column("qztl_is_gt")]
+ public char? QztlIsGt { get; set; }
+
+ [Column("qztl_is_main")]
+ public char? QztlIsMain { get; set; }
+
+ [Column("qztl_is_wh")]
+ public char? QztlIsWh { get; set; }
+
+ [Column("qztl_is_fj")]
+ public char? QztlIsFj { get; set; }
+
+ [Column("is_qztl_import")]
+ public char? IsQztlImport { get; set; }
+
+ [Column("upload_qztl_flag")]
+ public char? UploadQztlFlag { get; set; }
+
+ [Column("planuserid")]
+ [StringLength(20)]
+ public string Planuserid { get; set; }
+
+ [Column("remark2")]
+ [StringLength(100)]
+ public string Remark2 { get; set; }
+
+ [Column("remark3")]
+ [StringLength(100)]
+ public string Remark3 { get; set; }
+
+ [Column("remark4")]
+ [StringLength(100)]
+ public string Remark4 { get; set; }
+
+ [Column("concurrency_stamp")]
+ public string ConcurrencyStamp { get; set; }
+
+ public override object[] GetKeys()
+ {
+ return new object[] { PatientRegisterId };
+ }
+ }
+}
diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisterExters/PatientRegisterExterDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisterExters/PatientRegisterExterDbMapping.cs
new file mode 100644
index 0000000..7b35725
--- /dev/null
+++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisterExters/PatientRegisterExterDbMapping.cs
@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using Shentun.Peis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Shentun.Peis.EntityFrameworkCore;
+
+namespace Shentun.Peis.DbMapping.PatientRegisterExters
+{
+
+ internal class PatientRegisterExterDbMapping : IEntityTypeConfiguration
+ {
+ public void Configure(EntityTypeBuilder entity)
+ {
+ entity.HasComment("人员登记信息扩展");
+
+ entity.ConfigureByConvention();
+ }
+
+ }
+}
diff --git a/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs b/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs
index 3e2617e..b41835a 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs
+++ b/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs
@@ -9,6 +9,7 @@ using Shentun.Peis.Books;
using Shentun.Peis.DbMapping;
using Shentun.Peis.DbMapping.ChargeRequestAsbitems;
using Shentun.Peis.DbMapping.ChargeRequests;
+using Shentun.Peis.DbMapping.PatientRegisterExters;
using Shentun.Peis.DbMapping.ThirdInterfaces;
using Shentun.Peis.Models;
using Shentun.Peis.RoleMenuInfos;
@@ -334,7 +335,7 @@ public class PeisDbContext :
public DbSet CollectItemTypes { get; set; } = null!;
-
+ public DbSet PatientRegisterExters { get; set; } = null!;
public PeisDbContext(DbContextOptions options)
: base(options)
{
@@ -566,7 +567,8 @@ public class PeisDbContext :
.ApplyConfiguration(new ChargeRequestDbMapping())
.ApplyConfiguration(new ChargeRequestAsbitemDbMapping())
.ApplyConfiguration(new ThirdInterfaceDbMapping())
- .ApplyConfiguration(new CollectItemTypeDbMapping());
+ .ApplyConfiguration(new CollectItemTypeDbMapping())
+ .ApplyConfiguration(new PatientRegisterExterDbMapping());
#endregion
diff --git a/src/Shentun.Peis.EntityFrameworkCore/Migrations/20240503145648_init20240503002.Designer.cs b/src/Shentun.Peis.EntityFrameworkCore/Migrations/20240503145648_init20240503002.Designer.cs
new file mode 100644
index 0000000..de326dd
--- /dev/null
+++ b/src/Shentun.Peis.EntityFrameworkCore/Migrations/20240503145648_init20240503002.Designer.cs
@@ -0,0 +1,14242 @@
+//
+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.Peis.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+ [DbContext(typeof(PeisDbContext))]
+ [Migration("20240503145648_init20240503002")]
+ partial class init20240503002
+ {
+ 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("AsbitemRoom", b =>
+ {
+ b.Property("AsbitemId")
+ .HasColumnType("uuid");
+
+ b.Property("RoomId")
+ .HasColumnType("uuid");
+
+ b.HasKey("AsbitemId", "RoomId");
+
+ b.ToTable("AsbitemRoom");
+ });
+
+ modelBuilder.Entity("RoomAsbitem", b =>
+ {
+ b.Property("RoomId")
+ .HasMaxLength(5)
+ .HasColumnType("uuid")
+ .HasColumnName("room_id")
+ .IsFixedLength();
+
+ b.Property("AsbitemId")
+ .HasMaxLength(6)
+ .HasColumnType("uuid")
+ .HasColumnName("asbitem_id")
+ .IsFixedLength();
+
+ b.HasKey("RoomId", "AsbitemId")
+ .HasName("pk_room_asbitem");
+
+ b.HasIndex("AsbitemId");
+
+ b.ToTable("room_asbitem", (string)null);
+
+ b.HasComment("房间包含组合项目设置");
+ });
+
+ modelBuilder.Entity("Shentun.Peis.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.Peis.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.Peis.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.Peis.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.Peis.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.Peis.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.Peis.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.Peis.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.Peis.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.Peis.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.Peis.Models.Asbitem", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id")
+ .IsFixedLength()
+ .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("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("DisplayName")
+ .IsRequired()
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)")
+ .HasColumnName("display_name")
+ .HasComment("名称");
+
+ b.Property("DisplayOrder")
+ .HasColumnType("integer")
+ .HasColumnName("display_order");
+
+ 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("IsDiagnosisFunction")
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(1)
+ .HasColumnType("character(1)")
+ .HasColumnName("is_diagnosis_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("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("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.HasKey("Id");
+
+ b.HasIndex("CollectItemTypeId");
+
+ b.HasIndex("ItemTypeId");
+
+ b.HasIndex(new[] { "DisplayName" }, "ix_asbitem")
+ .IsUnique();
+
+ b.ToTable("asbitem");
+
+ b.HasComment("组合项目");
+ });
+
+ modelBuilder.Entity("Shentun.Peis.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.Peis.Models.AsbitemGuide", b =>
+ {
+ b.Property("OrganizationUnitId")
+ .HasColumnType("uuid")
+ .HasColumnName("organization_unit_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("OrganizationUnitId", "AsbitemId", "ForSexId")
+ .HasName("pk_department_asbitem_guide");
+
+ b.ToTable("asbitem_guide");
+
+ b.HasComment("体检中心组和项目指引内容");
+ });
+
+ modelBuilder.Entity("Shentun.Peis.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.Peis.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("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.Peis.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(200)
+ .HasColumnType("character varying(200)")
+ .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.Peis.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.Peis.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(20)
+ .HasColumnType("character varying(20)")
+ .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(20)
+ .HasColumnType("character varying(20)")
+ .HasColumnName("simple_code");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ItemTypeId");
+
+ b.ToTable("bigtext_result_type");
+
+ b.HasComment("大文本结果类别");
+ });
+
+ modelBuilder.Entity("Shentun.Peis.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.Peis.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.Peis.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.Peis.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.Peis.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