XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-10-22 15:30:40 +08:00
parent 06cb92b7e0 f7a3e87ba8
commit 09405dea8b
8 changed files with 18094 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -17007,6 +17007,36 @@
标准类型
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.TrialExperienceCommand.OtherStages">
<summary>
其他分期
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.TrialExperienceCommand.OtherCriterion">
<summary>
其他标准
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.GcpAndOtherExperienceDTO.GCPTime">
<summary>
GCP证书的时间
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.GcpAndOtherExperienceDTO.GCPAgencies">
<summary>
GCP机构
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.GCPExperienceCommand.GCPTime">
<summary>
GCP证书的时间
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.GCPExperienceCommand.GCPAgencies">
<summary>
GCP机构
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.UserBasicInfo.LastLoginIP">
<summary>
LastLoginIP

30
IRaCIS.Core.Application/Service/Doctor/DTO/TrialExperienceModel.cs
View File

@ -16,6 +16,16 @@
public int VisitReadingCount { get; set; }
/// <summary>
/// 其他分期
/// </summary>
public string OtherStages { get; set; } = string.Empty;
/// <summary>
/// 其他标准
/// </summary>
public string OtherCriterion { get; set; } = string.Empty;
//public string Term { get; set; }
//public string EvaluationCriteria { get; set; }
@ -58,6 +68,16 @@
public Guid? GCPId { get; set; }
/// <summary>
/// GCP证书的时间
/// </summary>
public DateTime? GCPTime { get; set; }
/// <summary>
/// GCP机构
/// </summary>
public string GCPAgencies { get; set; }
public string OtherClinicalExperience { get; set; } = String.Empty;
public string OtherClinicalExperienceCN { get; set; } = String.Empty;
@ -75,6 +95,16 @@
public int GCP { get; set; }
public Guid? GCPId { get; set; }
/// <summary>
/// GCP证书的时间
/// </summary>
public DateTime? GCPTime { get; set; }
/// <summary>
/// GCP机构
/// </summary>
public string GCPAgencies { get; set; }
}
public class ClinicalExperienceCommand

5
IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs
View File

@ -30,6 +30,8 @@ namespace IRaCIS.Core.Application.Service
{
trialExperience.GCP = doctor.GCP;
trialExperience.Id = doctor.Id;
trialExperience.GCPTime = doctor.GCPTime;
trialExperience.GCPAgencies = doctor.GCPAgencies;
trialExperience.OtherClinicalExperience = doctor.OtherClinicalExperience ?? "";
trialExperience.OtherClinicalExperienceCN = doctor.OtherClinicalExperienceCN ?? "";
var attachment = await _attachmentRepository.FirstOrDefaultAsync(t => t.Id == doctor.GCPId);
@ -38,6 +40,7 @@ namespace IRaCIS.Core.Application.Service
trialExperience.ExpiryDateStr = attachment.ExpiryDate == null ? "" : attachment.ExpiryDate.Value.ToString("yyyy-MM-dd HH:mm");
trialExperience.Path = attachment.Path;
trialExperience.GCPFullPath = attachment.Path + "?access_token=" + _userInfo.UserToken;
trialExperience.Type = attachment.Type;
trialExperience.FileName = attachment.FileName;
@ -133,6 +136,8 @@ namespace IRaCIS.Core.Application.Service
var successs = await _doctorRepository.BatchUpdateNoTrackingAsync(o => o.Id == updateGCPExperienceParam.Id, u => new Doctor()
{
GCP = updateGCPExperienceParam.GCP,
GCPAgencies= updateGCPExperienceParam.GCPAgencies,
GCPTime= updateGCPExperienceParam.GCPTime,
GCPId = (updateGCPExperienceParam.GCP == 0 || updateGCPExperienceParam.GCPId == null) ? Guid.Empty : updateGCPExperienceParam.GCPId!.Value
});

10
IRaCIS.Core.Domain/Dcotor/Doctor.cs
View File

@ -81,6 +81,16 @@ public class Doctor : BaseFullAuditEntity
public int GCP { get; set; }
/// <summary>
/// GCP证书的时间
/// </summary>
public DateTime? GCPTime { get; set; }
/// <summary>
/// GCP机构
/// </summary>
public string GCPAgencies { get; set; }
public Guid GCPId { get; set; }
public Guid? HospitalId { get; set; }

10
IRaCIS.Core.Domain/Dcotor/TrialExperience.cs
View File

@ -21,4 +21,14 @@ public partial class TrialExperience : BaseFullAuditEntity
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
/// <summary>
/// 其他分期
/// </summary>
public string OtherStages { get; set; } = string.Empty;
/// <summary>
/// 其他标准
/// </summary>
public string OtherCriterion { get; set; } = string.Empty;
}

17926
IRaCIS.Core.Infra.EFCore/Migrations/20241022072705_doctorinfo10221525.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

65
IRaCIS.Core.Infra.EFCore/Migrations/20241022072705_doctorinfo10221525.cs Normal file
View File

@ -0,0 +1,65 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class doctorinfo10221525 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "OtherCriterion",
table: "TrialExperience",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "OtherStages",
table: "TrialExperience",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "GCPAgencies",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<DateTime>(
name: "GCPTime",
table: "Doctor",
type: "datetime2",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "OtherCriterion",
table: "TrialExperience");
migrationBuilder.DropColumn(
name: "OtherStages",
table: "TrialExperience");
migrationBuilder.DropColumn(
name: "GCPAgencies",
table: "Doctor");
migrationBuilder.DropColumn(
name: "GCPTime",
table: "Doctor");
}
}
}

18
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -1394,9 +1394,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<int>("GCP")
.HasColumnType("int");
b.Property<string>("GCPAgencies")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<Guid>("GCPId")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("GCPTime")
.HasColumnType("datetime2");
b.Property<Guid?>("HospitalId")
.HasColumnType("uniqueidentifier");
@ -11213,6 +11221,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("OtherCriterion")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("OtherStages")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<Guid?>("PhaseId")
.HasColumnType("uniqueidentifier");