Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs

@@ -659,7 +659,7 @@ namespace Shentun.Peis.DataMigrations
             if (count == 0)
             {
 
-                var oldItemTypeList = await Db.Ado.GetDataTableAsync("select department_id,department_type,department_name,merge_asbitem_flag from department order by display_order asc");
+                var oldItemTypeList = await Db.Ado.GetDataTableAsync("select department_id,department_type,department_name,merge_asbitem_flag,print_pacs_barcode_flag from department order by display_order asc");
                 if (oldItemTypeList.Rows.Count > 0)
                 {
                     foreach (DataRow row in oldItemTypeList.Rows)
@@ -679,8 +679,8 @@ namespace Shentun.Peis.DataMigrations
                                 IsWrap = 'N',
                                 MedicalReportTypeId = defaultMedicalReportTypeId,
                                 ParentId = null,
-                                PathCode = _itemTypeManager.CreatePathCode(null).Result
-
+                                PathCode = _itemTypeManager.CreatePathCode(null).Result,
+                                IsCheckRequest = Convert.ToChar(row["print_pacs_barcode_flag"])
                             };
 
                             await _itemTypeRepository.InsertAsync(data);
@@ -916,7 +916,8 @@ namespace Shentun.Peis.DataMigrations
                                         IsWrap = itemTypeEnt.IsWrap,
                                         MedicalReportTypeId = itemTypeEnt.MedicalReportTypeId,
                                         ParentId = itemTypeEnt.Id,
-                                        PathCode = _itemTypeManager.CreatePathCode(itemTypeEnt.Id).Result
+                                        PathCode = _itemTypeManager.CreatePathCode(itemTypeEnt.Id).Result,
+                                        IsCheckRequest = itemTypeEnt.IsCheckRequest
                                     };
 
                                     await _itemTypeRepository.InsertAsync(item_type_data);
@@ -1071,7 +1072,8 @@ namespace Shentun.Peis.DataMigrations
                                         IsWrap = itemTypeEnt.IsWrap,
                                         MedicalReportTypeId = itemTypeEnt.MedicalReportTypeId,
                                         ParentId = itemTypeEnt.Id,
-                                        PathCode = _itemTypeManager.CreatePathCode(itemTypeEnt.Id).Result
+                                        PathCode = _itemTypeManager.CreatePathCode(itemTypeEnt.Id).Result,
+                                        IsCheckRequest = itemTypeEnt.IsCheckRequest
                                     };
 
                                     await _itemTypeRepository.InsertAsync(item_type_data);
@@ -1352,7 +1354,8 @@ namespace Shentun.Peis.DataMigrations
                                             IsWrap = itemTypeEnt.IsWrap,
                                             MedicalReportTypeId = itemTypeEnt.MedicalReportTypeId,
                                             ParentId = itemTypeEnt.Id,
-                                            PathCode = _itemTypeManager.CreatePathCode(itemTypeEnt.Id).Result
+                                            PathCode = _itemTypeManager.CreatePathCode(itemTypeEnt.Id).Result,
+                                            IsCheckRequest = itemTypeEnt.IsCheckRequest
                                         };
 
                                         await _itemTypeRepository.InsertAsync(item_type_data);

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240508032316_init20240508001.cs

@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240508001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<char>(
+                name: "is_check_request",
+                table: "item_type",
+                type: "character(1)",
+                nullable: false,
+                defaultValueSql: "'N'",
+                comment: "支持检查申请");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "is_check_request",
+                table: "item_type");
+        }
+    }
+}

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

@@ -5107,6 +5107,13 @@ namespace Shentun.Peis.Migrations
                         .IsFixedLength()
                         .HasComment("指引类别");
 
+                    b.Property<char>("IsCheckRequest")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_check_request")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("支持检查申请");
+
                     b.Property<char>("IsMergeAsbitem")
                         .ValueGeneratedOnAdd()
                         .HasMaxLength(1)