合并冲突解决

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

@@ -3393,11 +3393,6 @@
             
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.EmployeeReservedDto.Source">
-            <summary>
-            
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.EmployeeReservedDto.UnitType">
             <summary>
             

performance/Performance.DtoModels/Response/EmployeeReservedDto.cs

@@ -19,11 +19,6 @@ public class EmployeeReservedDto
         /// <summary>
         /// 
         /// </summary>
-        public string Source { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
         public string UnitType { get; set; }
         
         /// <summary>

performance/Performance.Repository/PerforReportRepository .cs

@@ -387,7 +387,6 @@ public List<PerReport> NurseAvg(ReportRequest request)
         /// <returns></returns>
         public List<EmployeeReservedDto> GetEmployeeReserved(ReservedRequest request)
         {
-            string view = request.Source == 1 ? "view_allot_result_report_emp" : request.Source == 2 ? "view_allot_result_report_issue_source" : request.Source == 3 ? "view_allot_result_report":"";
             string view = request.Source == 1 ? "view_allot_result_report_emp" : request.Source == 2 ? "view_allot_result_report_issue_source" : request.Source == 3 ? "view_allot_result_report" : "";
 
             string sql = $"SELECT * FROM {view} WHERE HospitalID=@HospitalID AND Year=@Year";