Merge branch '修改bug' into v2020morge

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -90,7 +90,7 @@ public SecondResponse GetSecondDetails(int userId, int secondId, int hospitalId,
             var userTemp = agusetempRepository.GetEntity(w => w.HospitalId == hospitalId && w.Department == secondAllot.Department && w.UnitType == secondAllot.UnitType);
             if (userTemp != null) tempId = userTemp.UseTempId ?? (int)Temp.other;
 
-            if (tempId == (int)Temp.other) return new SecondResponse();
+            //if (tempId == (int)Temp.other) return new SecondResponse();
 
             if (isArchive == 1 || new List<int> { (int)SecondAllotStatus.WaitReview, (int)SecondAllotStatus.PassAudit }.Contains(secondAllot.Status ?? (int)SecondAllotStatus.Uncommitted))
                 employeeSource = (int)EmployeeSource.Initial;
@@ -98,6 +98,8 @@ public SecondResponse GetSecondDetails(int userId, int secondId, int hospitalId,
             // 历史保存过的数据
             var savedDataList = agfixatitemRepository.GetEntities(w => w.SecondId == secondAllot.Id);
             
+            if (secondAllot.UseTempId != null) tempId = (int)secondAllot.UseTempId;
+            
             var header = GetHeadItems(hospitalId, tempId, secondAllot);
 
             var body = GetBodyItems(userId, employeeSource, secondAllot, prevSecondAllot, header, savedDataList);