注释备份

src/Shentun.Peis.Application/ItemResultTemplates/ItemResultTemplateAppService.cs

@@ -94,7 +94,39 @@ namespace Shentun.Peis.ItemResultTemplates
         }
 
 
+        /// <summary>
+        /// 获取项目结果模板列表  根据项目ID
+        /// </summary>
+        /// <param name="ItemId">项目ID</param>
+        /// <returns></returns>
+        public async Task<List<ItemResultTemplateDto>> GetListInItemIdAsync(Guid ItemId)
+        {
 
+            var entlist = await Repository.GetListAsync(m => m.ItemId == ItemId);
+
+   
+            var entdto = entlist.Select(s => new ItemResultTemplateDto
+            {
+                CreationTime = s.CreationTime,
+                CreatorId = s.CreatorId,
+                ItemId = s.ItemId,
+                Id = s.Id,
+                LastModificationTime = s.LastModificationTime,
+                LastModifierId = s.LastModifierId,
+                DiagnosisId = s.DiagnosisId,
+                SimpleCode = s.SimpleCode,
+                ResultStatusId = s.ResultStatusId,
+                Result = s.Result,
+                IsResultIntoSummary = s.IsResultIntoSummary,
+                DisplayOrder = s.DisplayOrder,
+                IsNameIntoSummary = s.IsNameIntoSummary,
+                CreatorName = EntityHelper.GetUserName(_userRepository, s.CreatorId),
+                LastModifierName = EntityHelper.GetUserName(_userRepository, s.LastModifierId)
+            }).ToList();
+
+            return entdto;
+
+        }
 
 
         /// <summary>

src/Shentun.Peis.Domain/Models/Patient.cs

@@ -16,6 +16,14 @@ namespace Shentun.Peis.Models
     [Index(nameof(DisplayName), Name = "ix_patient_1")]
     public   class Patient: AuditedEntity<Guid>,IDisplayName
     {
+
+        /// <summary>
+        /// 档案号  需要配置唯一索引
+        /// </summary>
+        [Column("patient_no")]
+        [StringLength(30)]
+        public string PatientNo { get; set; }
+
         /// <summary>
         /// 登录密码
         /// </summary>

src/Shentun.Peis.Domain/Models/PatientRegister.cs

@@ -45,7 +45,7 @@ namespace Shentun.Peis.Models
         /// 档案号
         /// </summary>
         [Column("patient_id")]
-        //[StringLength(10)]
+        [StringLength(10)]
         public Guid PatientId { get; set; }  
         /// <summary>
         /// 体检次数

src/Shentun.Peis.Domain/Models/SmsSend.cs

@@ -30,7 +30,7 @@ namespace Shentun.Peis.Models
         /// 人员ID
         /// </summary>
         [Column("patient_id")]
-        //[StringLength(10)]
+        [StringLength(10)]
         public Guid? PatientId { get; set; }
         /// <summary>
         /// 姓名

src/Shentun.Peis.EntityFrameworkCore/Migrations/20230619080014_sss1.cs

@@ -0,0 +1,434 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class sss1 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "short_name",
+                table: "asbitem",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: true,
+                comment: "简称",
+                oldClrType: typeof(string),
+                oldType: "character varying(20)",
+                oldMaxLength: 20,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<decimal>(
+                name: "queue_time",
+                table: "asbitem",
+                type: "numeric(3,1)",
+                precision: 3,
+                scale: 1,
+                nullable: false,
+                comment: "候诊时间",
+                oldClrType: typeof(decimal),
+                oldType: "numeric(3,1)",
+                oldPrecision: 3,
+                oldScale: 1);
+
+            migrationBuilder.AlterColumn<decimal>(
+                name: "price",
+                table: "asbitem",
+                type: "numeric(8,2)",
+                precision: 8,
+                scale: 2,
+                nullable: false,
+                comment: "价格",
+                oldClrType: typeof(decimal),
+                oldType: "numeric(8,2)",
+                oldPrecision: 8,
+                oldScale: 2);
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "item_type_id",
+                table: "asbitem",
+                type: "uuid",
+                fixedLength: true,
+                nullable: false,
+                comment: "项目类别",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldFixedLength: true);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_picture_rotate",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                comment: "体检报告图片旋转90°",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_item_result_merger",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                comment: "项目结果合并",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_diagnosis_function",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                comment: "启用诊断函数",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_continue_process",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                comment: "诊断函数处理完毕后继续处理",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_check",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                comment: "是检查项目",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_before_eat",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                comment: "餐前项目",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_active",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                comment: "是启用",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1);
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "invoice_item_type_id",
+                table: "asbitem",
+                type: "uuid",
+                fixedLength: true,
+                nullable: false,
+                comment: "发票类别",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldFixedLength: true);
+
+            migrationBuilder.AlterColumn<char>(
+                name: "for_sex_id",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                defaultValueSql: "'A'::bpchar",
+                comment: "适用性别，M-男,F-女，A-全部",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldDefaultValueSql: "'A'::bpchar");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "display_name",
+                table: "asbitem",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true,
+                comment: "名称",
+                oldClrType: typeof(string),
+                oldType: "character varying(30)",
+                oldMaxLength: 30,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "diagnosis_function",
+                table: "asbitem",
+                type: "character varying(1000)",
+                maxLength: 1000,
+                nullable: true,
+                comment: "诊断函数",
+                oldClrType: typeof(string),
+                oldType: "character varying(1000)",
+                oldMaxLength: 1000,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "device_type_id",
+                table: "asbitem",
+                type: "uuid",
+                fixedLength: true,
+                nullable: false,
+                comment: "仪器类别",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldFixedLength: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "default_result",
+                table: "asbitem",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: true,
+                comment: "默认结果",
+                oldClrType: typeof(string),
+                oldType: "character varying(100)",
+                oldMaxLength: 100,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "clinical_meaning",
+                table: "asbitem",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: true,
+                comment: "临床意义",
+                oldClrType: typeof(string),
+                oldType: "character varying(100)",
+                oldMaxLength: 100,
+                oldNullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "short_name",
+                table: "asbitem",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(20)",
+                oldMaxLength: 20,
+                oldNullable: true,
+                oldComment: "简称");
+
+            migrationBuilder.AlterColumn<decimal>(
+                name: "queue_time",
+                table: "asbitem",
+                type: "numeric(3,1)",
+                precision: 3,
+                scale: 1,
+                nullable: false,
+                oldClrType: typeof(decimal),
+                oldType: "numeric(3,1)",
+                oldPrecision: 3,
+                oldScale: 1,
+                oldComment: "候诊时间");
+
+            migrationBuilder.AlterColumn<decimal>(
+                name: "price",
+                table: "asbitem",
+                type: "numeric(8,2)",
+                precision: 8,
+                scale: 2,
+                nullable: false,
+                oldClrType: typeof(decimal),
+                oldType: "numeric(8,2)",
+                oldPrecision: 8,
+                oldScale: 2,
+                oldComment: "价格");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "item_type_id",
+                table: "asbitem",
+                type: "uuid",
+                fixedLength: true,
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldFixedLength: true,
+                oldComment: "项目类别");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_picture_rotate",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldComment: "体检报告图片旋转90°");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_item_result_merger",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldComment: "项目结果合并");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_diagnosis_function",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldComment: "启用诊断函数");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_continue_process",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldComment: "诊断函数处理完毕后继续处理");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_check",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldComment: "是检查项目");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_before_eat",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldComment: "餐前项目");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "is_active",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldComment: "是启用");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "invoice_item_type_id",
+                table: "asbitem",
+                type: "uuid",
+                fixedLength: true,
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldFixedLength: true,
+                oldComment: "发票类别");
+
+            migrationBuilder.AlterColumn<char>(
+                name: "for_sex_id",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                defaultValueSql: "'A'::bpchar",
+                oldClrType: typeof(char),
+                oldType: "character(1)",
+                oldMaxLength: 1,
+                oldDefaultValueSql: "'A'::bpchar",
+                oldComment: "适用性别，M-男,F-女，A-全部");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "display_name",
+                table: "asbitem",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(30)",
+                oldMaxLength: 30,
+                oldNullable: true,
+                oldComment: "名称");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "diagnosis_function",
+                table: "asbitem",
+                type: "character varying(1000)",
+                maxLength: 1000,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(1000)",
+                oldMaxLength: 1000,
+                oldNullable: true,
+                oldComment: "诊断函数");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "device_type_id",
+                table: "asbitem",
+                type: "uuid",
+                fixedLength: true,
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldFixedLength: true,
+                oldComment: "仪器类别");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "default_result",
+                table: "asbitem",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(100)",
+                oldMaxLength: 100,
+                oldNullable: true,
+                oldComment: "默认结果");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "clinical_meaning",
+                table: "asbitem",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(100)",
+                oldMaxLength: 100,
+                oldNullable: true,
+                oldComment: "临床意义");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/20230625012410_i062502.cs

@@ -0,0 +1,55 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class i062502 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "PatientNo",
+                table: "patient",
+                newName: "patient_no");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_patient_PatientNo",
+                table: "patient",
+                newName: "IX_patient_patient_no");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "patient_no",
+                table: "patient",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "patient_no",
+                table: "patient",
+                newName: "PatientNo");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_patient_patient_no",
+                table: "patient",
+                newName: "IX_patient_PatientNo");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PatientNo",
+                table: "patient",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(30)",
+                oldMaxLength: 30,
+                oldNullable: true);
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/20230625012649_i062503.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class i062503 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "patient_no",
+                table: "patient",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true,
+                comment: "档案号",
+                oldClrType: typeof(string),
+                oldType: "character varying(30)",
+                oldMaxLength: 30,
+                oldNullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "patient_no",
+                table: "patient",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(30)",
+                oldMaxLength: 30,
+                oldNullable: true,
+                oldComment: "档案号");
+        }
+    }
+}