Merge branch 'feature/划拨' into release/v20210709功能分支合并

performance/Performance.Services/CostTransfer/CostTransferService.cs

@@ -179,6 +179,7 @@ public CommonResponse Common(int allotId, int hospitalId, int roleType, string d
             var (prevAllotList, deptDetail) = DeptDetial(allotId, hospitalId, roleType, deparment);
 
             common.unitType = deptDetail.UnitType ?? "";
+            if (string.IsNullOrEmpty(detail.UnitType)) return common;
 
             var drugFactor = perforCofdrugtypefactor.GetEntities(t => t.HospitalId == hospitalId && t.AllotID == allotId);
             if (drugFactor == null || !drugFactor.Any()) return common;
@@ -270,6 +271,9 @@ public bool Applicat(CostTransferRequest request)
             if (request.Adopted.Department == request.Applicant.Department && request.Adopted.UnitType == request.Applicant.UnitType)
                 throw new PerformanceException("参数错误，提交科室相同");
 
+            var item=request.Items.Where(t => string.IsNullOrEmpty(t.Source) || string.IsNullOrEmpty(t.Category));
+            if(item.Count()>0) throw new PerformanceException("参数错误，申请信息填写不完整");
+
             var allot = perallotRepository.GetEntity(t => t.ID == request.AllotId);
             var allotStatus = new[] { (int)AllotStates.GenerateSucceed, (int)AllotStates.Archive };