11

src/Shentun.Peis.Application.Contracts/QueueRegisters/RoomQueueListDto.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace Shentun.Peis.QueueRegisters
 {
@@ -11,11 +12,23 @@ namespace Shentun.Peis.QueueRegisters
         /// </summary>
         public string ItemTypeName { get; set; }
 
+        /// <summary>
+        ///   
+        /// </summary>
+        [JsonIgnore]
+        public int ItemTypeDisplayOrder { get; set; }
+
         /// <summary>
         /// 房间名称
         /// </summary>
         public string RoomName { get; set; }
 
+        /// <summary>
+        ///  
+        /// </summary>
+        [JsonIgnore]
+        public int RoomDisplayOrder { get; set; }
+
         /// <summary>
         /// 候诊人数
         /// </summary>

src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs

@@ -460,7 +460,8 @@ namespace Shentun.Peis.ChargeReports
                         from ag in gg.DefaultIfEmpty()
                         join h in await _userRepository.GetQueryableAsync() on a.CreatorId equals h.Id into hh
                         from ah in hh.DefaultIfEmpty()
-                        where c.CustomerOrgId == GuidFlag.PersonCustomerOrgId && a.ChargeFlag == ChargeFlag.Charge
+                            //where c.CustomerOrgId == GuidFlag.PersonCustomerOrgId && a.ChargeFlag == ChargeFlag.Charge
+                        where f.PayTypeFlag == RegisterCheckAsbitemPayTypeFlag.PersonalPayment && a.ChargeFlag == ChargeFlag.Charge
                         select new
                         {
                             a,
@@ -494,19 +495,19 @@ namespace Shentun.Peis.ChargeReports
                 query = query.Where(m => m.PatientNo == input.PatientNo);
             }
 
-            var patientRegisterGroup = query.Select(s => new GetPersonalFeeDetailsReportInFeeDetailsDto
+            var patientRegisterGroup = query.ToList().GroupBy(g => g.f).Select(s => new GetPersonalFeeDetailsReportInFeeDetailsDto
             {
-                Age = s.c.Age,
-                AsbitemName = s.AsbitemName,
-                BookKeepingName = s.BookKeepingName,
-                BookkeepingTiem = DataHelper.ConversionDateToString(s.a.CreationTime),
-                CharePrice = DataHelper.DecimalRetainDecimals(s.b.ChargePrice * s.b.Amount, 2),
-                MedicalTimes = s.c.MedicalTimes,
-                PatientName = s.c.PatientName,
-                PatientNo = s.PatientNo,
-                SexName = s.SexName,
-                StandardPrice = DataHelper.DecimalRetainDecimals(s.f.StandardPrice * s.f.Amount, 2),
-                Discount = s.f.StandardPrice * s.f.Amount == 0 ? "0%" : Math.Floor((s.b.ChargePrice * s.b.Amount) / (s.f.StandardPrice * s.f.Amount)) + "%"
+                Age = s.FirstOrDefault().c.Age,
+                AsbitemName = s.FirstOrDefault().AsbitemName,
+                BookKeepingName = s.FirstOrDefault().BookKeepingName,
+                BookkeepingTiem = DataHelper.ConversionDateToString(s.FirstOrDefault().a.CreationTime),
+                CharePrice = DataHelper.DecimalRetainDecimals(s.FirstOrDefault().b.ChargePrice * s.FirstOrDefault().b.Amount, 2),
+                MedicalTimes = s.FirstOrDefault().c.MedicalTimes,
+                PatientName = s.FirstOrDefault().c.PatientName,
+                PatientNo = s.FirstOrDefault().PatientNo,
+                SexName = s.FirstOrDefault().SexName,
+                StandardPrice = DataHelper.DecimalRetainDecimals(s.Key.StandardPrice * s.Key.Amount, 2),
+                Discount = s.Key.StandardPrice * s.Key.Amount == 0 ? "0%" : Math.Floor((s.FirstOrDefault().b.ChargePrice * s.FirstOrDefault().b.Amount) / (s.Key.StandardPrice * s.Key.Amount)) + "%"
             }).ToList();
 
             return patientRegisterGroup;
@@ -533,7 +534,8 @@ namespace Shentun.Peis.ChargeReports
                         from ag in gg.DefaultIfEmpty()
                         join h in await _userRepository.GetQueryableAsync() on a.CreatorId equals h.Id into hh
                         from ah in hh.DefaultIfEmpty()
-                        where c.CustomerOrgId == GuidFlag.PersonCustomerOrgId && a.ChargeFlag == ChargeFlag.ChargeBack
+                            //where c.CustomerOrgId == GuidFlag.PersonCustomerOrgId && a.ChargeFlag == ChargeFlag.ChargeBack
+                        where f.PayTypeFlag == RegisterCheckAsbitemPayTypeFlag.PersonalPayment && a.ChargeFlag == ChargeFlag.ChargeBack
                         select new
                         {
                             a,
@@ -645,7 +647,8 @@ namespace Shentun.Peis.ChargeReports
                         from af in ff.DefaultIfEmpty()
                         join g in await _userRepository.GetQueryableAsync() on charge.CreatorId equals g.Id into gg
                         from ag in gg.DefaultIfEmpty()
-                        where patientRegister.CustomerOrgId == GuidFlag.PersonCustomerOrgId
+                            // where patientRegister.CustomerOrgId == GuidFlag.PersonCustomerOrgId
+                        where registerCheckAsbitem.PayTypeFlag == RegisterCheckAsbitemPayTypeFlag.PersonalPayment
                         select new
                         {
                             charge,

src/Shentun.Peis.Application/DiagnosisFunctions/DiagnosisFunctionAppService.cs

@@ -578,7 +578,14 @@ namespace Shentun.Peis.DiagnosisFunctions
                                     var temp_diagnosis = await _diagnosisRepository.FirstOrDefaultAsync(m => m.Id == template.DiagnosisId);
                                     if (temp_diagnosis != null)
                                     {
-                                        tempDiagnosisList.Add(temp_diagnosis.DisplayName);
+                                        if (template.IsNameIntoSummary == 'Y')
+                                        {
+                                            tempDiagnosisList.Add($"{item.ItemName}{temp_diagnosis.DisplayName}");
+                                        }
+                                        else
+                                        {
+                                            tempDiagnosisList.Add(temp_diagnosis.DisplayName);
+                                        }
                                     }
                                 }
                             }
@@ -832,7 +839,7 @@ namespace Shentun.Peis.DiagnosisFunctions
             {
                 string resultSplitConvert = Regex.Replace(resultSplit, @"(\d+)\s*\*\s*(\d+)", "*");
                 resultSplitConvert = Regex.Replace(resultSplitConvert, @"\d+(\.\d+)?", "$");
-                
+
                 if (string.IsNullOrWhiteSpace(resultSplit) || resultSplit.StartsWith("余未见异常"))
                 {
                     continue;

src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs

@@ -169,8 +169,10 @@ namespace Shentun.Peis.QueueRegisters
                               {
                                   ItemTypeName = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayName : "",
                                   RoomName = roomGroup.FirstOrDefault().room.DisplayName,
-                                  WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null)
-                              }).ToList();
+                                  WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null),
+                                  ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0,
+                                  RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder
+                              }).ToList().OrderBy(o => o.ItemTypeDisplayOrder).ThenBy(o => o.RoomDisplayOrder).ToList();
 
             return entListDto;
         }

src/Shentun.Peis.Domain/CardRegisters/CardRegisterManager.cs

@@ -192,8 +192,8 @@ namespace Shentun.Peis.CardRegisters
             DataHelper.CheckEntityIsNull(entity);
             DataHelper.CheckStringIsNull(entity.CardNo, "卡号");
             DataHelper.CheckStringIsNull(entity.CustomerName, "领用者");
-            DataHelper.CheckStringIsNull(entity.IdNo, "身份证号");
-            DataHelper.CheckStringIsNull(entity.IdNo, "手机号");
+            //DataHelper.CheckStringIsNull(entity.IdNo, "身份证号");
+            //DataHelper.CheckStringIsNull(entity.IdNo, "手机号");
             DataHelper.CheckGuidIsDefaultValue(entity.CardTypeId, "卡类型");
             DataHelper.CheckGuidIsDefaultValue(entity.MedicalCenterId, "体检中心");
             DataHelper.CheckCharIsYOrN(entity.IsActive, "使用标志");

src/Shentun.Peis.Domain/CustomerOrgs/CustomerOrg.cs

@@ -194,6 +194,12 @@ namespace Shentun.Peis.Models
         [Column("personnel_type_id")]
         public Guid? PersonnelTypeId { get; set; }
 
+        /// <summary>
+        /// 是否推荐  用于单位排序
+        /// </summary>
+        [Column("is_recommend")]
+        public char IsRecommend { get; set; }
+
         //[Column("concurrency_stamp")]
         //[StringLength(40)]
         //public string ConcurrencyStamp { get; set; } = null!;

src/Shentun.Peis.EntityFrameworkCore/DbMapping/CardRegisters/CardRegisterDbMapping.cs

@@ -40,13 +40,13 @@ namespace Shentun.Peis.DbMapping
 
             entity.Property(e => e.ExpiryDate).HasComment("有效期").IsRequired();
 
-            entity.Property(e => e.IdNo).HasComment("身份证号").IsRequired();
+            //entity.Property(e => e.IdNo).HasComment("身份证号").IsRequired();
 
             //entity.Property(e => e.LastModificationTime).HasComment("最后修改日期");
 
             //entity.Property(e => e.LastModifierId).HasComment("最后修改者");
 
-            entity.Property(e => e.MobileTelephone).HasComment("手机").IsRequired();
+            //entity.Property(e => e.MobileTelephone).HasComment("手机").IsRequired();
 
             // entity.Property(e => e.OrganizationUnitId).IsFixedLength();
 

src/Shentun.Peis.EntityFrameworkCore/DbMapping/CustomerOrgs/CustomerOrgDbMapping.cs

@@ -25,6 +25,7 @@ namespace Shentun.Peis.DbMapping
             entity.Property(t => t.IsActive).HasComment("状态").IsRequired().HasDefaultValueSql("'Y'");
             entity.Property(t => t.MedicalTypeId).HasComment("体检类别id");
             entity.Property(t => t.PersonnelTypeId).HasComment("人员类别id");
+            entity.Property(t => t.IsRecommend).HasComment("是否推荐").IsRequired().HasDefaultValueSql("'N'");
 
             entity.Property(e => e.Id)
                 .IsFixedLength()

src/Shentun.Peis.EntityFrameworkCore/Migrations/20251215033322_card_register_delete_bitian.cs

@@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class card_register_delete_bitian : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "mobile_telephone",
+                table: "card_register",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(20)",
+                oldMaxLength: 20,
+                oldComment: "手机");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "id_no",
+                table: "card_register",
+                type: "character varying(18)",
+                maxLength: 18,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(18)",
+                oldMaxLength: 18,
+                oldComment: "身份证号");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "mobile_telephone",
+                table: "card_register",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: false,
+                defaultValue: "",
+                comment: "手机",
+                oldClrType: typeof(string),
+                oldType: "character varying(20)",
+                oldMaxLength: 20,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "id_no",
+                table: "card_register",
+                type: "character varying(18)",
+                maxLength: 18,
+                nullable: false,
+                defaultValue: "",
+                comment: "身份证号",
+                oldClrType: typeof(string),
+                oldType: "character varying(18)",
+                oldMaxLength: 18,
+                oldNullable: true);
+        }
+    }
+}

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

@@ -19,7 +19,7 @@ namespace Shentun.Peis.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
-                .HasAnnotation("ProductVersion", "6.0.19")
+                .HasAnnotation("ProductVersion", "6.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -1321,11 +1321,9 @@ namespace Shentun.Peis.Migrations
                         .HasComment("有效期");
 
                     b.Property<string>("IdNo")
-                        .IsRequired()
                         .HasMaxLength(18)
                         .HasColumnType("character varying(18)")
-                        .HasColumnName("id_no")
-                        .HasComment("身份证号");
+                        .HasColumnName("id_no");
 
                     b.Property<char>("IsActive")
                         .ValueGeneratedOnAdd()
@@ -1350,11 +1348,9 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("medical_center_id");
 
                     b.Property<string>("MobileTelephone")
-                        .IsRequired()
                         .HasMaxLength(20)
                         .HasColumnType("character varying(20)")
-                        .HasColumnName("mobile_telephone")
-                        .HasComment("手机");
+                        .HasColumnName("mobile_telephone");
 
                     b.Property<string>("Remark")
                         .HasMaxLength(200)
@@ -13103,7 +13099,7 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("method_name");
 
                     b.Property<string>("Parameters")
-                        .HasMaxLength(50000)
+                        .HasMaxLength(2000)
                         .HasColumnType("text")
                         .HasColumnName("parameters");