null值查询

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

@@ -709,12 +709,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.CostTransferController.SelectCommon(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:Performance.Api.Controllers.CostTransferController.DeptDetial(System.Int32,System.Int32)">
             <summary>
             当前科室、类别

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

@@ -836,6 +836,9 @@
         <member name="F:Performance.DtoModels.SheetType.Assess">
             <summary> 考核 </summary>
         </member>
+        <member name="F:Performance.DtoModels.SheetType.DoctorIncome">
+            <summary> 医生收入 </summary>
+        </member>
         <member name="F:Performance.DtoModels.SheetType.Custom">
             <summary> 自定义抽取模板 </summary>
         </member>

performance/Performance.Services/PersonService.cs

@@ -720,7 +720,7 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
             var dicData = CreateDataRow(request, dict);
             List<per_employee> employees = new List<per_employee>();
             var persons = peremployeeRepository.GetEntities(t => t.HospitalId == HospitalId && t.AllotId == AllotId);
-            var delPersonsNum =new List<string>();
+            var delPersonsNum = new List<string>();
             foreach (var item in dicData)
             {
                 if (!string.IsNullOrEmpty(item["AttendanceDay"]) && !string.IsNullOrEmpty(item["ReservedRatio"]))
@@ -760,7 +760,7 @@ public void SaveDeptDicHands(int HospitalId, SaveCollectData request)
         {
             var dicData = CreateDataRow(request, DeptDic);
             var deptDic = perdeptdicRepository.GetEntities(t => t.HospitalId == HospitalId);
-            var depts =deptDic?.Select(w => new { w.Department, w.HISDeptName }).Distinct();
+            var depts = deptDic?.Select(w => new { w.Department, w.HISDeptName }).Distinct();
             List<per_dept_dic> deptDics = new List<per_dept_dic>();
             var delDepartment = new List<string>();
             foreach (var dic in dicData)
@@ -778,9 +778,10 @@ public void SaveDeptDicHands(int HospitalId, SaveCollectData request)
                 }
 
             }
-            var delDept = deptDic.Where(t => delDepartment.Contains(t.HISDeptName)).ToArray();
-            perdeptdicRepository.RemoveRange(delDept);
-            if (deptDics.Any())
+            var delDept = deptDic?.Where(t => delDepartment.Contains(t.HISDeptName)).ToArray();
+            if (delDept != null && delDept.Any())
+                perdeptdicRepository.RemoveRange(delDept);
+            if (deptDics != null && deptDics.Any())
                 perdeptdicRepository.AddRange(deptDics.ToArray());
         }