项目结果换行、会员卡

src/Shentun.Peis.Application.Contracts/CardRegisters/CreateCardBillDto.cs

@@ -15,7 +15,7 @@ namespace Shentun.Peis.CardRegisters
         /// </summary>
         public string PayModeId { get; set; }
         /// <summary>
-        /// 记账金额
+        /// 记账金额  退费金额填负数
         /// </summary>
         public decimal BillMoney { get; set; }
         /// <summary>

src/Shentun.Peis.Application.Contracts/ItemTypes/CreateItemTypeDto.cs

@@ -33,10 +33,11 @@ namespace Shentun.Peis.ItemTypes
         /// </summary>
         public Guid MedicalReportTypeId { get; set; }
 
+
         /// <summary>
-        /// 项目结果行模式 (0 单行  1 多行)
+        /// 项目结果行模式 (Y 可以换行  N 不可换行   )
         /// </summary>
-        public char LineModeFlag { get; set; }
+        public char IsWrap { get; set; }
 
     }
 }

src/Shentun.Peis.Application.Contracts/ItemTypes/ItemTypeDto.cs

@@ -39,8 +39,8 @@ namespace Shentun.Peis.ItemTypes
         public int DisplayOrder { get; set; }
 
         /// <summary>
-        /// 项目结果行模式 (0 单行  1 多行)
+        /// 项目结果行模式 (Y 可以换行  N 不可换行   )
         /// </summary>
-        public char LineModeFlag { get; set; }
+        public char IsWrap { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/ItemTypes/UpdateItemTypeDto.cs

@@ -31,9 +31,9 @@ namespace Shentun.Peis.ItemTypes
         public Guid MedicalReportTypeId { get; set; }
 
         /// <summary>
-        /// 项目结果行模式 (0 单行  1 多行)
+        /// 项目结果行模式 (Y 可以换行  N 不可换行   )
         /// </summary>
-        public char LineModeFlag { get; set; }
+        public char IsWrap { get; set; }
 
     }
 }

src/Shentun.Peis.Application/RegisterCheckItems/RegisterCheckItemAppService.cs

@@ -136,7 +136,7 @@ namespace Shentun.Peis.RegisterCheckItems
                 Result = string.IsNullOrEmpty(s.Result) && s.RegisterCheck.CompleteFlag == RegisterCheckCompleteFlag.UnChecked ? s.Item.DefaultResult : s.Result,
                 ResultStatusId = s.ResultStatusId,
                 Unit = s.Unit,
-                LineModeFlag = s.Item.LineModeFlag == '2' ? s.Item.ItemType.LineModeFlag : s.Item.LineModeFlag,
+                LineModeFlag = s.Item.LineModeFlag == '2' ? (s.Item.ItemType.IsWrap == 'N' ? '0' : '1') : s.Item.LineModeFlag,
                 CreationTime = s.CreationTime,
                 CreatorId = s.CreatorId,
                 LastModificationTime = s.LastModificationTime,

src/Shentun.Peis.Domain/ItemTypes/ItemType.cs

@@ -87,10 +87,10 @@ namespace Shentun.Peis.Models
         public int DisplayOrder { get; set; }
 
         /// <summary>
-        /// 项目结果行模式 (0 单行   1 多行   )
+        /// 项目结果行模式 (Y 可以换行  N 不可换行   )
         /// </summary>
-        [Column("line_mode_flag")]
-        public char LineModeFlag { get; set; }
+        [Column("is_wrap")]
+        public char IsWrap { get; set; }
 
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }

src/Shentun.Peis.Domain/ItemTypes/ItemTypeManager.cs

@@ -55,7 +55,7 @@ namespace Shentun.Peis.ItemTypes
                 MedicalReportTypeId = entity.MedicalReportTypeId,
                 ParentId = entity.ParentId,
                 PathCode = await CreatePathCode(entity.ParentId),
-                LineModeFlag = entity.LineModeFlag
+                IsWrap = entity.IsWrap
             };
         }
         /// <summary>
@@ -80,7 +80,7 @@ namespace Shentun.Peis.ItemTypes
             targetEntity.GuidTypeId = sourceEntity.GuidTypeId;
             targetEntity.IsMergeAsbitem = sourceEntity.IsMergeAsbitem;
             targetEntity.MedicalReportTypeId = sourceEntity.MedicalReportTypeId;
-            targetEntity.LineModeFlag = sourceEntity.LineModeFlag;
+            targetEntity.IsWrap = sourceEntity.IsWrap;
             if (!string.IsNullOrEmpty(sourceEntity.PathCode) && sourceEntity.PathCode != targetEntity.PathCode)
             {
                 throw new ArgumentException($"路径编码不支持修改");
@@ -99,6 +99,7 @@ namespace Shentun.Peis.ItemTypes
             DataHelper.CheckStringIsNull(entity.DisplayName, "名称");
             DataHelper.CheckGuidIsDefaultValue(entity.GuidTypeId, "指引类别");
             DataHelper.CheckCharIsYOrN(entity.IsMergeAsbitem, "是否合并组合项目");
+            DataHelper.CheckCharIsYOrN(entity.IsWrap, "项目结果行模式");
             DataHelper.CheckGuidIsDefaultValue(entity.MedicalReportTypeId, "体检报告类别");
 
         }

src/Shentun.Peis.EntityFrameworkCore/DbMapping/ItemTypes/ItemTypeDbMapping.cs

@@ -24,7 +24,7 @@ namespace Shentun.Peis.DbMapping
                 IsRequired().HasDefaultValueSql("'G'::bpchar"); ;
             entity.Property(t => t.GuidTypeId).HasComment("指引类别").IsRequired().IsFixedLength();
             entity.Property(t => t.MedicalReportTypeId).HasComment("体检报告类别").IsRequired().IsFixedLength();
-            entity.Property(t => t.LineModeFlag).HasComment("项目结果行模式").HasDefaultValue('0').IsRequired();
+            entity.Property(t => t.IsWrap).HasComment("项目结果是否可以换行").HasDefaultValueSql("'N'").IsRequired();
 
             entity.Property(e => e.Id).IsFixedLength();
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240321091748_init20240321001.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240321001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "line_mode_flag",
+                table: "item_type");
+
+            migrationBuilder.AddColumn<char>(
+                name: "is_wrap",
+                table: "item_type",
+                type: "character(1)",
+                nullable: false,
+                defaultValueSql: "'N'",
+                comment: "项目结果是否可以换行");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "is_wrap",
+                table: "item_type");
+
+            migrationBuilder.AddColumn<char>(
+                name: "line_mode_flag",
+                table: "item_type",
+                type: "character(1)",
+                nullable: false,
+                defaultValue: '0',
+                comment: "项目结果行模式");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -4690,6 +4690,13 @@ namespace Shentun.Peis.Migrations
                         .HasDefaultValueSql("'N'")
                         .HasComment("合并组合项目，Y-是,N-否");
 
+                    b.Property<char>("IsWrap")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_wrap")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("项目结果是否可以换行");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .IsRequired()
                         .HasColumnType("timestamp without time zone")
@@ -4700,13 +4707,6 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("uuid")
                         .HasColumnName("last_modifier_id");
 
-                    b.Property<char>("LineModeFlag")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("character(1)")
-                        .HasDefaultValue('0')
-                        .HasColumnName("line_mode_flag")
-                        .HasComment("项目结果行模式");
-
                     b.Property<Guid>("MedicalReportTypeId")
                         .HasColumnType("uuid")
                         .HasColumnName("medical_report_type_id")