修改

IRaCIS.Core.API/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_B;User ID=sa;Password=dev123456DEV;",
+    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_P;User ID=sa;Password=dev123456DEV;",
     "hang": "Server=ZHOU;Database=IRaCIS;User ID=sa;Password=sa123456;"
     //"RemoteTest": "Server=123.56.181.144,14333\\MSSQLExpress14;Database=IRaCIS_B;User ID=sa;Password=dev123456DEV;"
   },

IRaCIS.Core.Application.Contracts/Doctor/DTO/AttachmentViewModel.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Application.ViewModels
         public string FullPath => SystemConfig.RootUrl + Path;
         public string FileName { get; set; } = string.Empty;
         public DateTime? CreateTime { get; set; }
-        
+        public int Language { get; set; }
     }
 
     public class ReviewerAckDTO

IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs

@@ -25,7 +25,7 @@ namespace IRaCIS.Application.ViewModels.Pay
         public decimal PaymentUSD { get; set; }
         public decimal PaymentCNY { get; set; }
 
-        public bool? IsNewTrial { get; set; }
+        //public bool? IsNewTrial { get; set; }
 
         //public decimal? NewPersonalAdditional { get; set; }
 

IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs

@@ -101,14 +101,14 @@ namespace IRaCIS.Application.ViewModels
         {
             get
             {
-                return this.Row.Sum(x => x.PaymentUSD);
+                return this.Row.Sum(x => x.TotalPaymentUSD);
             }
         }
 
         public decimal SumPaymentCNY {
             get
             {
-                return this.Row.Sum(x => x.PaymentCNY);
+                return this.Row.Sum(x => x.TotalPaymentCNY);
             }
         }
     }

IRaCIS.Core.Application/Financial/CalculateService.cs

@@ -814,6 +814,10 @@ namespace IRaCIS.Application.Services
                 //payment.BankTransferCNY = bankTransferCNY;
                 payment.YearMonthDate = DateTime.Parse(payment.YearMonth);
 
+                var lastpayment = _paymentRepository.GetAll().Where(x => x.DoctorId == addOrUpdateModel.DoctorId && x.YearMonthDate == payment.YearMonthDate.AddMonths(-1)).FirstOrDefault();
+                payment.PaymentMethod = lastpayment == null ? PaymentMethod.CloudPayment : lastpayment.PaymentMethod;
+
+
                 payment = _paymentRepository.Add(payment);
                 success = _paymentRepository.SaveChanges();
                 return ResponseOutput.Result(success, payment.Id);

IRaCIS.Core.Application/Financial/FinancialService.cs

@@ -239,9 +239,9 @@ namespace IRaCIS.Application.Services
             //费用调整
             //_payAdjustmentRepository.Where(t => t.YearMonth == yearMonthStr && t.ReviewerId == reviewerId)
             var adjList =
-               (from costAdjustment in _payAdjustmentRepository.GetAll().Where(t => t.YearMonth == yearMonthStr && t.ReviewerId == paymentId)
+               (from costAdjustment in _payAdjustmentRepository.GetAll().Where(t => t.YearMonth == yearMonthStr && t.ReviewerId == reviewerId)
-                      join enroll in _enrollRepository.GetAll()on new { costAdjustment.ReviewerId, costAdjustment.TrialId } equals new { ReviewerId = enroll.DoctorId, enroll.TrialId }
+                      //join enroll in _enrollRepository.GetAll()on new { costAdjustment.ReviewerId, costAdjustment.TrialId } equals new { ReviewerId = enroll.DoctorId, enroll.TrialId }
-                      join price in _TrialPaymentPriceRepository.GetAll() on costAdjustment.TrialId equals price.TrialId
+                      //join price in _TrialPaymentPriceRepository.GetAll() on costAdjustment.TrialId equals price.TrialId
 
 
                       select new PaymentDetailDTO()
@@ -258,7 +258,7 @@ namespace IRaCIS.Application.Services
                               AdjustPaymentCNY = costAdjustment.AdjustmentCNY,
                               Note = costAdjustment.Note
                           },
-                          IsNewTrial = price.IsNewTrial,
+                          //IsNewTrial = price.IsNewTrial,
                           //NewPersonalAdditional = enroll.AdjustmentMultiple,
 
                       }).ToList();
@@ -1348,7 +1348,7 @@ namespace IRaCIS.Application.Services
 
             var summaryPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payment Summary.xlsx");
 
-
+           
             var sumData = GetMonthlyPaymentList(new MonthlyPaymentQueryDTO()
             {
                 PageIndex = 1,

IRaCIS.Core.Domain/Dcotor/Attachment.cs

@@ -26,6 +26,7 @@ namespace IRaCIS.Core.Domain.Models
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; } = Guid.Empty;
 
+        public int Language { get; set; }
         //public Guid CreateUserId { get; set; } = Guid.Empty;
         //public DateTime? CreateTime { get; set; }
     }