Merge branch 'release/jixiao55'

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -276,11 +276,11 @@ public ApiResponse SingleAwards([FromBody] WorkloadRequest request)
         /// 二次绩效工作量类型列表
         /// </summary>
         /// <returns></returns>
-        [Route("api/second/worktype/list")]
+        [Route("api/second/worktype/list/{secondId}")]
         [HttpPost]
-        public ApiResponse WorkTypeList([FromBody] WorkloadRequest request)
+        public ApiResponse WorkTypeList([FromBody] WorkloadRequest request, int secondId)
         {
-            var result = secondAllotService.WorkTypeList(request, claimService.GetUserId());
+            var result = secondAllotService.WorkTypeList(request, secondId);
             return new ApiResponse(ResponseType.OK, result);
         }
 
@@ -288,16 +288,16 @@ public ApiResponse WorkTypeList([FromBody] WorkloadRequest request)
         /// 保存二次绩效工作量类型
         /// </summary>
         /// <returns></returns>
-        [Route("api/second/worktype/save")]
+        [Route("api/second/worktype/save/{secondId}")]
         [HttpPost]
-        public ApiResponse SingleSave([FromBody] ag_workload_type request)
+        public ApiResponse SingleSave([FromBody] ag_workload_type request, int secondId)
         {
             if (request.HospitalId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "医院信息无效");
             if (string.IsNullOrEmpty(request.TypeName))
                 return new ApiResponse(ResponseType.ParameterError, "填写参数无效");
 
-            var result = secondAllotService.SaveWorkType(request, claimService.GetUserId());
+            var result = secondAllotService.SaveWorkType(request, secondId);
             return new ApiResponse(ResponseType.OK, result);
         }
 
@@ -522,11 +522,11 @@ public ApiResponse SaveValue([FromRoute] int secondId, [FromBody] dynamic reques
         /// 二次绩效录入页面自动补全
         /// </summary>
         /// <returns></returns>
-        [Route("api/second/autocomplete/{secondId}/{jobNumber}")]
+        [Route("api/second/autocomplete/{secondId}")]
         [HttpPost]
-        public ApiResponse AutoCompleteBodyData([FromRoute] int secondId, string jobNumber)
+        public ApiResponse AutoCompleteBodyData([FromRoute] int secondId, SecondEmployeeRequest request)
         {
-            var result = secondAllotService.AutoComplete(secondId, jobNumber);
+            var result = secondAllotService.AutoComplete(secondId, request);
             return new ApiResponse(ResponseType.OK, result);
         }
     }

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    "PerformanceConnectionString": "server=192.168.18.166;database=db_test_liutie;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

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

@@ -1436,7 +1436,7 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.AutoCompleteBodyData(System.Int32,System.String)">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.AutoCompleteBodyData(System.Int32,Performance.DtoModels.SecondEmployeeRequest)">
             <summary>
             二次绩效录入页面自动补全
             </summary>

performance/Performance.DtoModels/Request/SecondEmpRequest.cs

@@ -5,17 +5,20 @@
 
 namespace Performance.DtoModels
 {
-    public class SecondEmpRequest
+    public class SecondEmployeeRequest
     {
-        public int TempId { get; set; }
-
-        public int SecondId { get; set; }
-
         public string EmployeeName { get; set; }
 
         public string JobNumber { get; set; }
     }
 
+    public class SecondEmpRequest : SecondEmployeeRequest
+    {
+        public int TempId { get; set; }
+
+        public int SecondId { get; set; }
+    }
+
     public class SecondEmpRequestValidator : AbstractValidator<SecondEmpRequest>
     {
         public SecondEmpRequestValidator()

performance/Performance.Services/ExtractExcelService/ExtractDtos/IncomeRow.cs

+namespace Performance.Services.ExtractExcelService
+{
+    public class IncomeRow
+    {
+        public string Department { get; set; }
+
+        public string DoctorAccount { get; set; }
+
+        public string NurseAccount { get; set; }
+
+        public string TechnicAccounting { get; set; }
+
+        public int RowNumber { get; set; }
+
+        public IncomeRow(string department, string doctorAccount, string nurseAccount, string technicAccounting, int rowNumber)
+        {
+            Department = department;
+            DoctorAccount = doctorAccount;
+            NurseAccount = nurseAccount;
+            TechnicAccounting = technicAccounting;
+            RowNumber = rowNumber;
+        }
+    }
+}

performance/Performance.Services/SecondAllot/SecondAllotService.cs

@@ -351,9 +351,9 @@ private ag_secondallot GetPreviousSecondAllot(int hospitalId, ag_secondallot sec
         /// 二次绩效分配录入人员自动补全信息
         /// </summary>
         /// <param name="secodId"></param>
-        /// <param name="workNumber">工号</param>
+        /// <param name="request">工号、姓名</param>
         /// <returns></returns>
-        public JArray AutoComplete(int secodId, string workNumber)
+        public JArray AutoComplete(int secodId, SecondEmployeeRequest request)
         {
             var second = agsecondallotRepository.GetEntity(t => t.Id == secodId);
             if (second == null)
@@ -367,8 +367,16 @@ public JArray AutoComplete(int secodId, string workNumber)
             if (usetemp == null)
                 throw new PerformanceException("当前科室暂未配置绩效模板");
 
-            var employees = peremployeeRepository.GetEntities(t => t.AllotId == allot.ID && !string.IsNullOrEmpty(t.PersonnelNumber) && t.PersonnelNumber.IndexOf(workNumber) > -1)
-                ?.OrderBy(t => t.PersonnelNumber).ThenByDescending(t => t.DoctorName).ToList();
+            #region 接口响应速度优化
+            var employees = new List<per_employee>();
+
+            if (!string.IsNullOrEmpty(request?.EmployeeName))
+                employees = peremployeeRepository.GetEntities(w => w.AllotId == second.AllotId.Value && w.DoctorName == request.EmployeeName);
+            if (!string.IsNullOrEmpty(request?.JobNumber))
+                employees = peremployeeRepository.GetEntities(w => w.AllotId == second.AllotId.Value && w.PersonnelNumber == request.JobNumber);
+            #endregion
+
+            employees = employees?.OrderBy(t => t.PersonnelNumber).ThenByDescending(t => t.DoctorName).ToList();
             if (employees == null || !employees.Any()) return new JArray();
 
             var bodysources = new List<ag_bodysource>();