From c3f489ece7c8db8c08fb019829c314e2e7e9d789 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 31 Oct 2022 11:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/appsettings.json              |   2 +-
 .../wwwroot/Template/Payment Summary.xlsx     | Bin 9784 -> 9794 bytes
 .../Doctor/DTO/AttachmentViewModel.cs         |   2 +-
 .../Financial/DTO/PaymentDetailViewModel.cs   |   2 +-
 .../Financial/DTO/PaymentViewModel.cs         |   4 ++--
 .../Financial/CalculateService.cs             |   4 ++++
 .../Financial/FinancialService.cs             |  10 +++++-----
 IRaCIS.Core.Domain/Dcotor/Attachment.cs       |   1 +
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.API/appsettings.json b/IRaCIS.Core.API/appsettings.json
index 67d9544..a39018b 100644
--- a/IRaCIS.Core.API/appsettings.json
+++ b/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;"
   },
diff --git a/IRaCIS.Core.API/wwwroot/Template/Payment Summary.xlsx b/IRaCIS.Core.API/wwwroot/Template/Payment Summary.xlsx
index 821b38d0e9121832dc943e9cc1576dc369d36d36..81ca59d4c5ec22085105e546ac7cb44db1b08059 100644
GIT binary patch
delta 3092
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

delta 3076
zcmZ9Oc{J3I7QkoBSjTQe7ztww{TNvylO;d<`m!V>6KX^>*}{~;h<=Ih*hLCivW+E6
zBgU3BB>T=#F(JmTUcKM%ymQ{W=iK|pJ$F0j-h0l6YF=kvkql-oSl+Wh0~ug3{9j3K
zX03m~+h>{I8FbyxtR~b)*FusnXz{LDhrzn0?MIGIKMFkDDWJbb9L#xq)7lOCK#_KP
zh7kylyjNq-Y$^~bX?->R3LREmI<m=hsUL-Od?^V3%*kEaJ(-y$+FcXvRl?=yMu=xJ
z(dxE%$UP$(SGmagv=`Zu8(H_!9<O>TJ1~K3@y}Y;EI!pvejR~c)D+kQ#Xra_zZa`^
zs`d*w(!={=<ah2@CUN+;;;(Ud_3iF9c`RPt{gv62yz_>h*tD!eLPzawAaJCUZQt&w
zHYD_m!(Z4>({T`myDjo>n%~ya>=DVnm!HVie2d_^8zEpxDbbtCG4t=;T(`RgV$`#W
z#L7wM8hrDk-P_r4EVW5bRE+OZ?LQ${{}N-u9<m<e$_VO;iG2I`2amr~BB_5_?HT_&
z@Qs|q0}Ya!wHX8o2Z2CrAfn~M#mXszAOHqYz@J{4k?Bh*L)`AnD3cI}XEmm(O><b-
zCgIMv{q*g~T4;$EM>nMsSB{%}7z(U+;2k?xXn%01K=u8ncW&jhuG~gQ^E!?e)}E~9
z*V18!IkeL)cD%Rc9<N3-i|6`q^Ys5^7Nv-08y_1ePoBk1yzkf_Tuc1ckR5NjWx_$@
z#kXi0g^?|Lt{qWZV16Mu{H5BA9QvB?eG!UpVmQ_6IZ)<zchBC&{xbaI10UNHhMEcl
zT#7PN)-`ie>Q@{kgm_Jd$PO(|Y&t+phKvj<5jWe<+mZbHuAk_Hd#IO}SkxPjBF&Ow
z^KrVJng+AuoGyqTH&KlfQ|JqON%S^x7cGWCqrfsztc3)%fgdEq@TCtfX^7%<KhYA~
zSpgfUGt{_&!@jBl8VClLRLQc`GO<vff*<{00T$V?kh|U#z=pk$4`yFmRyNmX9$Umr
zM%I_@_W)cRA^1QPof*?M&UH2nGAEkMscWF84j<2dCA?{<)LkQto_hfUabX+>p+z@M
zjWnYaeHViz<VFPMEF#VP)~w}LVz#du$3zwspM0Bhy)ZVt$>GDhaK@2*DC4NBtJO=E
z2d^2j{dsAA*FIG$7$Un!p6e+`?;rQ@4EkBU3*FyC;nA)sn`r#*pcOjeE2}<ppJM3d
zKH!#pA!M_?^IgQ&7-aTDuyxGtO>^l6izfrR2`w51kFi=OW4BDUrOXlRVh?>2zCMW)
zo1@En>RyenTbdRa&<Sf^1z4YyQjE>vjNUL*9AZv+<#l^>>VwSCGXB<M6V)9nWtkgO
zx*fzOeEp=Rzy4%;-oUx7JY1dMpKU646Xp%)RZL>_4-jaHw#DgiQ-o{KO}V-yspxNZ
z!_;9jlN|0W!wmN6=PGSCzHXh=r{Af%&r_qh6+$uKc9DidJ;fIfqqNjqI|ZUWa=LY&
zIHhkmJ6_V2x^Ksq;*Thj81kTMe&u{b(oNT9!XGIyAIro<(6|njGdq-R<wEB^hQRK+
z8hzU!1V$|m6X}D}3Ldin>(dv)bblIQJ>ZT0HmVIQ3u_He;Fq29(ui!tt);1%@g93h
z>Quh9tOMRr<VD@DH*i+tUfFf3g}6+5!VhYn&EKB%Wtpsq-H%)8DDtGR?Vj}+)DBL<
zukjVe?IXY5CPqx=5`KmeUH{c1G@I&GD%?;#^K^_-J08*r)0mO!cC@lMS&!_Sai%h<
ztx=z+poo^XVr@fg5noMX*u|zCuSpT04yUXI8IoDlCW?qR(j&b{+>8{!zH$k*_NjEU
zV%K4(+G%u!cT!8*zA?<3IJ$i&VoDA_EL_sDY@TUVT_C8aJwB0aF2A=U16;1LG5cVD
zt{}bObFY2fYkBpRfah=TaIwJD-Mt9c&``zl)=D=kt`$V@d+RM<4-&E6aK4<~X1V5`
zG}Yj`!4hZc*z1fjn!MUdPT+^-_xodtj*y{#b!uMw!jV(b($$v77+xJ03q^VS=n1m{
z8<h93!z!4=e}dEK&QNrYKZhO=dNy`kxGY{D=`)h;6klNMC9ZMgbUC^wo|$=(<gbu7
z(V|LLQ7b1~R~ml6(A`Q$ab%arkZezKmLOL2spQWzLEc*$)fhF&Tm{xfwHNhO2~M(0
z0+$TWiiqceGh@R!=UFXl&<1#gc`6lN9r0lDTwiSnZD-{5N78yVXa5tA6eG>ml!HK-
za!r`Vab87>PI50~_HC``O8<IX*<O4=epbg%l*4uaNP`V)fOyEO9K>wYV4DFJQdk&>
z9*T`|0k1ZFK|EEuV*o3E7*=;({U<D-@aLOzUiZ?-F@)z6uRNsX6lL)W{84Lq&Z^@<
zG2~md+m6YKb{N%SOqqG<I3&Q>(QUW+-ZTLM*DKESO{xJCw4dR>-L=;vRL;C4t@eGv
zv=80H&aKbXja_GXWl2Zkek>me$($%T^kGzeH_~yF>Ur{6sLI7wshq=W6RSopni+_?
zabj-h3RZh0tFweLrHPMSc-#4h<C>Rk9jpGqDaW6MZ0X0YxkAIbv&5OWxh(>XN6+4E
z$c0PQSi|@b3py0n_6AH!$itr6r~0lmIl65a)uiph$0x`)7Q!vb@fIZQXLj*ICV?Fl
ztu+W|<8y{PxJT3hIW#e?IgQ7K=4TVO0b-&+-uw{od}rAO$7h=(^6pbHqYrpqja$jk
zBe7MMIqqsn$U{uj=M7CX9&SFyPj)l@u0+<usyy?Kp37JtnB(vaR=VZTqaV!hnb)WG
zaw;|QsteuHW!?x^#7-S}vj$IMN=F;&0ty_zd&xOdgV8r;fDdHSIAH+`VX%;j7Dw$;
zRG62ZS?aI|t9I2hSgXLiP#8PDwf!&v3<4DZ+@c74izW3U{L-$>k5<eAlaOt5oAAdJ
z@4+ZTQGNH80H2)dToeIS&T(^(Z}&&^8T@;<3Z+7SZ>RpLyKXa-^vc6C*-1jy=M$;9
z(}6^O-rUFhDnXxd0YQN#kBnp_Q%u3!E`);c-M#lCA|~^K6S*o2-@C~;VTf0QQmO<8
z%|rp;U!hrCpP$O%nCAgnD*CjFQ&#Nf*E5krJ><TyZkzOINekk4f3Wd+S*gINk;VtF
z=3xR{*iRkPHX;U1l32_ts=1wubw<`jpIKX7q~~-+g>^g(ZVI`;^30I7Hs4G#^5@Im
zJBf$hxHal7_(G53e%<|iF{f}(p*`=|d98E!<jKpzC>2&!Pqu=()jY<2(+cdVdx3>P
zb^;AM87}}9=~h?I48>?}q{U?n7bnY9a=K=`$w$24R@!jB{PBUy&domxr6O*faW47T
zBN8Z}gC8;EWKcMTz{TO$Bop&JgO;^E#E*ss52BmLS`~hzA9DQ<f3RG<joT|$04l`f
z@$#?rsLGFQq=Z`aHm|;^@-g_CucRDt-z$g^ysZ|FqM!A19nGvdw*<RBG?R=|r;#3%
zP=>x)5AD8L=}Jl><=YJfvm%dU3^hK{`x>@3_r4q_N;Kyu)oKw1J&Jr=y44t9F-wtC
zrM+^C5A%8Tiiepn*tEH$Cr(8O1bfLI{#1;gh)e6sa;p<p#ZU7+?)663oR_{*Dth}G
z+Sd@nRzCD%y(+iuJt>FO|J?NapI@}=)HzHS<aM&DTfQ7;!MclQkwJWy-qBqRQp=8A
zlPtAqjXb3R&bF0T1A6bQQ6A`4pY#xHkKEPSA*w(hzRu;>sDodPWnY(Cx0`qYoJ34q
zxvA4un!y#@(|9E#RLI0FCO-bs>A3k08n*b<F8~p#;t{_H1rq>k$&27sAW;$p<^kFz
zfq&rGMe4lhZ<>?+b=%xbAdtW>#``T`ki;*`0LW4oSuLO-P_WNgpcp9ztV?o(H2`U8
zb+9YoEUhH^-@kx>K)?C$xBQ*E0lbvfV>;jgmZi18d4L2`O!RN^0fF8l{=ZQV;DD47
z{m)i^4KnjfdH$~TPcagZhSUN30-unlMSla;@UM1xoFI_!|3qZ~d@^TPL?wSa{|#Ky
BqJjVb

diff --git a/IRaCIS.Core.Application.Contracts/Doctor/DTO/AttachmentViewModel.cs b/IRaCIS.Core.Application.Contracts/Doctor/DTO/AttachmentViewModel.cs
index 954244a..0af6d7a 100644
--- a/IRaCIS.Core.Application.Contracts/Doctor/DTO/AttachmentViewModel.cs
+++ b/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
diff --git a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs b/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs
index 3db74b4..927d412 100644
--- a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs
+++ b/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; }
 
diff --git a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs b/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs
index 21f34e9..9efd049 100644
--- a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs
+++ b/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);
             }
         }
     }
diff --git a/IRaCIS.Core.Application/Financial/CalculateService.cs b/IRaCIS.Core.Application/Financial/CalculateService.cs
index b6d8850..e2084e6 100644
--- a/IRaCIS.Core.Application/Financial/CalculateService.cs
+++ b/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);
diff --git a/IRaCIS.Core.Application/Financial/FinancialService.cs b/IRaCIS.Core.Application/Financial/FinancialService.cs
index 3f16399..536db5a 100644
--- a/IRaCIS.Core.Application/Financial/FinancialService.cs
+++ b/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)
-                      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
+               (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 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,
diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs
index b28fa4f..620b81d 100644
--- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs
+++ b/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; }
     }