修改重复点击职称绩效重新载入导致金额消失问题

Performance.Subsidy/Performance.Subsidy.Api/Controllers/SubsidyController.cs

@@ -114,7 +114,7 @@ public ApiResponse SaveJobTitleSubsidy(int allotId, [FromBody] List<sub_subsidy>
         public ApiResponse SaveSubsidy(int allotId,[FromBody] List<sub_subsidy> subsidies)
         {
             var result = _service.SaveSubsidy(allotId, subsidies);
-            return new ApiResponse(Status.Ok, subsidies);
+            return new ApiResponse(Status.Ok, result);
         }
     }
 }

Performance.Subsidy/Performance.Subsidy.Services/SubsidyService.cs

@@ -50,7 +50,7 @@ public IEnumerable<sub_jobtitle> GetJobTitle(int allotId, int hospitalId)
                 var jobTitles = _dbConnection.Query<sub_jobtitle>(jobTitleSql, new { allotId });
                 if (jobTitles?.Count() > 0) return jobTitles;
 
-                jobTitles = _dbConnection.Query<sub_jobtitle>($@"SELECT DISTINCT JobTitle FROM db_performance_subsidy.sub_subsidy where AllotID=@allotId;", new { allotId }).Select(t => new sub_jobtitle { JobTitle = t.JobTitle, BasicPerforFee = t.BasicPerforFee ?? 0 });
+                jobTitles = _dbConnection.Query<sub_jobtitle>($@"SELECT DISTINCT JobTitle FROM db_performance_subsidy.sub_subsidy where AllotID=@allotId and JobTitle is not null;", new { allotId }).Select(t => new sub_jobtitle { JobTitle = t.JobTitle, BasicPerforFee = t.BasicPerforFee ?? 0 });
 
                 var allotOder = _dbConnection.Query<view_allot>($@"SELECT * from view_allot a WHERE a.HospitalId=@HospitalId ORDER BY a.`Year`,a.`Month`;", new { hospitalId }).ToList();
                 if (!allotOder.Any()) return jobTitles;
@@ -82,7 +82,7 @@ public void GetHrpJobTitle(int allotId, int hospitalId, bool isRefresh)
                 var allot = GetAllot(allotId);
                 if (allot == null) throw new Exception("AllotId无效");
 
-                var subsidies = _dbConnection.Query<sub_subsidy>("select * from sub_subsidy where AllotID=@allotId;", new { allotId });
+                var subsidies = _dbConnection.Query<sub_subsidy>("select * from sub_subsidy where AllotID=@allotId and JobTitle is not null;", new { allotId });
                 if (subsidies.Any() && isRefresh == false) return;
 
                 var config = _dbConnection.QueryFirst<ex_config>("select * from ex_config where hospitalId=@hospitalId", new { hospitalId });
@@ -91,14 +91,14 @@ public void GetHrpJobTitle(int allotId, int hospitalId, bool isRefresh)
 
                 var hrp = _dbConnection.QueryFirst<ex_script>("select * from ex_script;");
                 var res = connection.Query<sub_subsidy>(hrp?.ExecScript, new { allotId }, commandTimeout: _commandTimeout);
-                var subsidy = subsidies.Select(t => new { t.JobTitle, t.BasicPerforFee }).Distinct();
+                var subsidy = _dbConnection.Query<sub_jobtitle>("select * from sub_jobtitle where AllotID=@allotId and JobTitle is not null;", new { allotId }).Select(t => new { t.JobTitle, t.BasicPerforFee }).Distinct();
 
                 //删除:在点击重新加载时删除记录重新插入
                 _dbConnection.Execute("delete from sub_subsidy where AllotID=@allotId;delete from sub_jobtitle where AllotID=@allotId;", new { allotId });
 
                 var jobtitle = res.Select(t => new { allotId, t.JobTitle, 
-                    BasicPerforFee=subsidy.Where(w => w.JobTitle == t.JobTitle)?.Select(t => t.BasicPerforFee).FirstOrDefault() }).Distinct();
-
+                    BasicPerforFee=subsidy.Where(w => w.JobTitle == t.JobTitle)?.Select(t => t.BasicPerforFee).FirstOrDefault() });
+                jobtitle = jobtitle.Distinct();
                 
                 var sql = $@"insert into sub_jobtitle(AllotID,JobTitle,BasicPerforFee) values (@allotId,@JobTitle,@BasicPerforFee);";
                 _dbConnection.Execute(sql, jobtitle);