From af13ca8d2fbde57b8ecc09d5839d9c6aca5be194 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Thu, 25 Apr 2024 16:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChargeRequestAsbitemManager.cs            | 45 +++++++++++++++++++
 .../ChargeRequests/ChargeRequest.cs           |  9 ++--
 .../ChargeRequests/ChargeRequestManager.cs    |  1 -
 .../ChargeRequests/ChargeRequestDbMapping.cs  |  1 -
 4 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 src/Shentun.Peis.Domain/ChargeRequestAsbitems/ChargeRequestAsbitemManager.cs

diff --git a/src/Shentun.Peis.Domain/ChargeRequestAsbitems/ChargeRequestAsbitemManager.cs b/src/Shentun.Peis.Domain/ChargeRequestAsbitems/ChargeRequestAsbitemManager.cs
new file mode 100644
index 0000000..6d34d2c
--- /dev/null
+++ b/src/Shentun.Peis.Domain/ChargeRequestAsbitems/ChargeRequestAsbitemManager.cs
@@ -0,0 +1,45 @@
+using Shentun.Peis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Domain.Services;
+
+namespace Shentun.Peis.ChargeRequestAsbitems
+{
+    public class ChargeRequestAsbitemManager : DomainService
+    {
+        private readonly IRepository<ChargeRequestAsbitem, Guid> _repository;
+        public ChargeRequestAsbitemManager(IRepository<ChargeRequestAsbitem, Guid> repository)
+        {
+            _repository = repository;
+
+        }
+
+        /// <summary>
+        /// 创建
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<ChargeRequestAsbitem> CreateAsync(
+          ChargeRequestAsbitem entity
+         )
+        {
+
+            return new ChargeRequestAsbitem(
+                GuidGenerator.Create()
+             )
+            {
+                ChargeRequestId = entity.ChargeRequestId,
+                AsbitemId = entity.AsbitemId,
+                RegisterAsbitemId = entity.RegisterAsbitemId,
+                ChargePrice = entity.ChargePrice,
+                Amount = entity.Amount,
+                IsCharge = 'N',
+
+            };
+        }
+    }
+}
diff --git a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequest.cs b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequest.cs
index a23d015..935cec1 100644
--- a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequest.cs
+++ b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequest.cs
@@ -31,11 +31,6 @@ namespace Shentun.Peis.Models
         [Column("patient_register_id")]
         public Guid PatientRegisterId { get; set; }
 
-        /// <summary>
-        /// 病人号
-        /// </summary>
-        [Column("patient_id")]
-        public Guid PatientId { get; set; }
 
         /// <summary>
         /// his 病人号
@@ -61,6 +56,10 @@ namespace Shentun.Peis.Models
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 
+        [ForeignKey(nameof(PatientRegisterId))]
+        [InverseProperty("ChargeRequest")]
+        public virtual PatientRegister PatientRegister { get; set; } = null!;
+
         //[ForeignKey(nameof(PatientRegisterId))]
         //[InverseProperty("Charges")]
         //public virtual PatientRegister PatientRegister { get; set; } = null!;
diff --git a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs
index 61ac79c..ba8b99b 100644
--- a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs
+++ b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs
@@ -33,7 +33,6 @@ namespace Shentun.Peis.ChargeRequests
              )
             {
                 PatientRegisterId = entity.PatientRegisterId,
-                PatientId = entity.PatientId,
                 HisPatientId = entity.HisPatientId,
                 HisChargeNo = entity.HisChargeNo,
                 ChargeRequestFlag = entity.ChargeRequestFlag,
diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/ChargeRequests/ChargeRequestDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/ChargeRequests/ChargeRequestDbMapping.cs
index 7369001..dbe567a 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/ChargeRequests/ChargeRequestDbMapping.cs
+++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/ChargeRequests/ChargeRequestDbMapping.cs
@@ -23,7 +23,6 @@ namespace Shentun.Peis.DbMapping.ChargeRequests
             entity.Property(e => e.ChargeRequestFlag).HasDefaultValueSql("0").IsRequired();
 
             entity.Property(e => e.PatientRegisterId).HasComment("登记流水号").IsRequired();
-            entity.Property(e => e.PatientId).HasComment("档案号").IsRequired();