Merge tag '银行卡号' into develop

# Conflicts:
#	performance/Performance.Services/ComputeService.cs

performance/Performance.Api/Controllers/ComputeController.cs

@@ -309,6 +309,7 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
                 RealGiveFee = t.Sum(s => s.RealGiveFee),
                 ReservedRatio = t.Sum(s => s.ReservedRatio),
                 ReservedRatioFee = t.Sum(s => s.ReservedRatioFee),
+                BankCard = t.FirstOrDefault()?.BankCard
             }).OrderBy(t =>
             {
                 string value = t.JobNumber;

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -2915,6 +2915,11 @@
             
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResponse.BankCard">
+            <summary>
+            银行卡号
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect">
             <summary> 概览</summary>
         </member>

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -4976,6 +4976,11 @@
             预留比例
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_employee.BankCard">
+            <summary>
+            银行卡号
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.per_employee.Remark">
             <summary>
             备注

performance/Performance.DtoModels/Response/ComputeResponse.cs

@@ -103,5 +103,10 @@ public ComputeResponse(string source, string accountingUnit, string employeeName
         /// 
         /// </summary>
         public Nullable<decimal> AdjustLaterOtherFee { get; set; }
+
+        /// <summary>
+        /// 银行卡号
+        /// </summary>
+        public string BankCard { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_employee.cs

@@ -115,7 +115,12 @@ public class per_employee
         /// 预留比例
         /// </summary>
         public Nullable<decimal> ReservedRatio { get; set; }
-    
+
+        /// <summary>
+        /// 银行卡号
+        /// </summary>
+        public string BankCard { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>

performance/Performance.Services/ComputeService.cs

@@ -756,6 +756,7 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
                     item.RealGiveFee = Math.Round(item.ShouldGiveFee - (item.ReservedRatioFee ?? 0) ?? 0, 2, MidpointRounding.AwayFromZero);
                     // 姓名始终按人员字典显示
                     item.EmployeeName = employees?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.DoctorName ?? "";
+                    item.BankCard = employees?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.BankCard ?? "";
                     // 人员信息使用人员字典中数据
                     if (isEmpDic)
                     {

performance/Performance.Services/PersonService.cs

@@ -93,6 +93,8 @@ public void CreateAllotPersons(int hospitalId, int allotId, int prevAllotId = -1
             {
                 var entity = new per_employee
                 {
+                    HospitalId = t.HospitalId,
+                    AllotId = allotId,
                     AccountingUnit = t.AccountingUnit,
                     Department = t.Department,
                     DoctorName = t.DoctorName,
@@ -107,10 +109,9 @@ public void CreateAllotPersons(int hospitalId, int allotId, int prevAllotId = -1
                     WorkTime = t.WorkTime,
                     BirthDate = t.BirthDate,
                     Age = t.Age,
-                    Remark = t.Remark,
-                    HospitalId = t.HospitalId,
-                    AllotId = allotId,
                     ReservedRatio = t.ReservedRatio,
+                    BankCard = t.BankCard,
+                    Remark = t.Remark,
                     CreateTime = DateTime.Now,
                 };
                 if (!string.IsNullOrEmpty(t.PersonnelNumber) && !string.IsNullOrEmpty(t.JobNumber))
@@ -246,10 +247,12 @@ public bool UpdatePerson(PerEmployeeResponse request)
             employee.WorkTime = request.WorkTime == null ? null : ConvertHelper.To<DateTime?>(request.WorkTime);
             employee.BirthDate = request.BirthDate == null ? null : ConvertHelper.To<DateTime?>(request.BirthDate);
             employee.Age = request.Age;
+            employee.BankCard = request.BankCard;
             employee.Remark = request.Remark;
             employee.EfficiencyNumber = request.EfficiencyNumber;
             employee.PermanentStaff = request.PermanentStaff;
             employee.AttendanceDay = request.AttendanceDay;
+            employee.ReservedRatio = request.ReservedRatio;
 
             // 出勤率
             var allot = perallotRepository.GetEntity(t => t.ID == request.AllotId);