调整申请和被申请显示

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

@@ -709,6 +709,18 @@
             </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>
+            当前科室、类别
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.CostTransferController.WithdrawSubmit(System.Int32)">
             <summary>
             撤回提交

performance/Performance.Services/CostTransfer/CostTransferService.cs

@@ -200,25 +200,6 @@ public CommonResponse Common(int allotId, int hospitalId, int roleType, string d
                 }
                 common.Data = commons;
             }
-            #region
-            /*
-            var drugType = cofdrugtypeRepository.GetEntities(t => t.HospitalId == hospitalId && t.AllotID == allotId)
-                ?.Select(t => new TitleValue { Title = t.Charge, Value = t.Charge }).ToDistinct();
-
-            var sheet = persheetRepository.GetEntities(t => t.AllotID == allotId && t.SheetType == (int)SheetType.Income)
-                ?.Select(t => new TitleValue
-                {
-                    Title = Regex.Replace(t.SheetName, @"\d.", "")
-                ,
-                    Value = Regex.Replace(t.SheetName, @"\d.", "")
-                }).ToDistinct();
-
-            
-
-            var dept = perdeptdicRepository.GetEntities(t => t.HospitalId == hospitalId)
-                ?.Select(t => new TitleValue { Title = t.AccountingUnit, Value = t.AccountingUnit }).ToDistinct();
-            */
-            #endregion
 
             return common;
         }
@@ -665,10 +646,10 @@ public TransferReportResponse TransferContent(int allotId, int auditType, Depart
             switch (auditType)
             {
                 case 1:
-                    transfers = transfers.Where(t => t.AdoptedDepartment == detail.Department && t.AdoptedUnitType == detail?.UnitType).ToList();
+                    transfers = transfers.Where(t => t.ApplicantDepartment == detail.Department && t.ApplicantUnitType == detail?.UnitType).ToList();
                     break;
                 case 2:
-                    transfers = transfers.Where(t => t.ApplicantDepartment == detail.Department && t.ApplicantUnitType == detail?.UnitType).ToList();
+                    transfers = transfers.Where(t => t.AdoptedDepartment == detail.Department && t.AdoptedUnitType == detail?.UnitType).ToList();
                     break;
                 default:
                     break;