申请、审核科室类别判断，下发状态修改

performance/Performance.Api/Controllers/AllotController.cs

@@ -100,7 +100,7 @@ public ApiResponse Insert([FromBody] AllotRequest request)
             var result = _allotService.InsertAllot(request, userId);
             _configService.Copy(result);
             //带出上月划拨记录
-            costTransferService.IntoLastTiemData(request.HospitalId.Value, request.ID);
+            costTransferService.IntoLastTiemData(request.HospitalId.Value, result.ID);
             return new ApiResponse(ResponseType.OK, result);
         }
 

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

@@ -2261,12 +2261,12 @@
         </member>
         <member name="P:Performance.EntityModels.cost_transfer.Status">
             <summary>
-            0 未审核 1 全部通过 2 部分通过 3 全部驳回 
+            0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
             </summary>
         </member>
         <member name="P:Performance.EntityModels.cost_transfer.AdminStatus">
             <summary>
-            0 未审核 1 全部通过 2 部分通过 3 全部驳回 
+            0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
             </summary>
         </member>
         <member name="T:Performance.EntityModels.cost_transfer_item">

performance/Performance.Services/CostTransfer/CostTransferService.cs

@@ -69,13 +69,20 @@ public List<CostTransferResponse> GetAuditList(int allotId, int menuType, int ro
 
             Expression<Func<cost_transfer, bool>> exp = t => t.AllotId == allotId;
             if (roleType == application.DirectorRole)
-                exp = exp.And(t => new List<string> { UnitType.医生组.ToString(), UnitType.医技组.ToString() }.Contains(t.AdoptedUnitType));
+                if (menuType == 1)
+                    exp = exp.And(t => new List<string> { UnitType.医生组.ToString(), UnitType.医技组.ToString() }.Contains(t.ApplicantUnitType));
+                else
+                    exp = exp.And(t => new List<string> { UnitType.医生组.ToString(), UnitType.医技组.ToString() }.Contains(t.AdoptedUnitType));
             else if (roleType == application.NurseRole)
-                exp = exp.And(t => t.AdoptedUnitType == UnitType.护理组.ToString());
+                if (menuType == 1)
+                    exp = exp.And(t => t.ApplicantUnitType == UnitType.护理组.ToString());
+                else
+                    exp = exp.And(t => t.AdoptedUnitType == UnitType.护理组.ToString());
+            /*
             else if (roleType == application.SpecialRole)
                 exp = exp.And(t => t.AdoptedUnitType == UnitType.特殊核算组.ToString());
             else if (roleType == application.OfficeRole)
-                exp = exp.And(t => t.AdoptedUnitType == UnitType.行政后勤.ToString());
+                exp = exp.And(t => t.AdoptedUnitType == UnitType.行政后勤.ToString()); */
 
             var costTransfers = costtransferRepository.GetEntities(exp);
 
@@ -456,7 +463,7 @@ public bool RejectedApplicat(int allotId)
             if (costTransfers == null || !costTransfers.Any()) return true;
 
             var costId = costTransfers?.Select(t => t.Id);
-            var costItems = costtransferitemRepository.GetEntities(t => costId.Contains(t.TransferId) && t.AdminStatus==0 );
+            var costItems = costtransferitemRepository.GetEntities(t => costId.Contains(t.TransferId) && t.AdminStatus == 0);
 
             costItems.ForEach(t =>
             {
@@ -500,7 +507,8 @@ public void IntoLastTiemData(int hospitalId, int allotId)
                 var newTransfers = new cost_transfer();
                 newTransfers = Mapper.Map<cost_transfer>(item);
                 newTransfers.AllotId = allotId;
-
+                newTransfers.Status = 0;
+                newTransfers.AdminStatus = 0;
                 costtransferRepository.Add(newTransfers);
 
                 var newCostItem = costItems.Where(t => t.TransferId == item.Id).Select(t => new cost_transfer_item
@@ -515,7 +523,7 @@ public void IntoLastTiemData(int hospitalId, int allotId)
                     Remark = t.Remark,
                     Status = 0,
                     AdminStatus = 0,
-                    IsWrited =0
+                    IsWrited = 0
                 }).ToArray();
                 costtransferitemRepository.AddRange(newCostItem);
             }
@@ -557,11 +565,6 @@ public void UpdateCostTransferStatus(int transferId)
                         transfer.Status = 3;
                         transfer.AdminStatus = 0;
                         break;
-                    //科室部分通过，绩效办待审核
-                    case var data when data.Any(t => t.Status == 1) && data.Any(t => t.Status != 1) && data.Any(t => t.AdminStatus == 0):
-                        transfer.Status = 2;
-                        transfer.AdminStatus = 0;
-                        break;
                     //科室部分通过，绩效办部分通过
                     case var data when data.Any(t => t.Status == 1) && data.Any(t => t.Status != 1) && data.Any(t => t.AdminStatus == 1) && data.Any(t => t.AdminStatus != 1):
                         transfer.Status = 2;
@@ -570,7 +573,12 @@ public void UpdateCostTransferStatus(int transferId)
                     //科室部分通过，绩效办全部驳回
                     case var data when data.Any(t => t.Status == 1) && data.Any(t => t.Status != 1) && data.Any(t => t.AdminStatus == 2):
                         transfer.Status = 2;
-                        transfer.AdminStatus = 2;
+                        transfer.AdminStatus = 3;
+                        break;
+                    //科室部分通过，绩效办待审核
+                    case var data when data.Any(t => t.Status == 1) && data.Any(t => t.Status != 1) && data.Any(t => t.AdminStatus == 0):
+                        transfer.Status = 2;
+                        transfer.AdminStatus = 0;
                         break;
                     //科室全部通过，绩效办待审核
                     case var data when data.Any(t => t.Status == 1) && data.Any(t => t.AdminStatus == 0):