合并

performance/Performance.Services/ConfigService.cs

@@ -1061,12 +1061,12 @@ public void CopyCommand(per_allot allot, int prevAllotId, bool delHistotyData =
             }
 
             logger.LogInformation($"copy drugTypes");
-            var drugTypes = _drugtypeRepository.GetEntities(t => t.AllotID == allot.ID);
+            var drugTypes = _drugtypeRepository.GetEntities(t => t.AllotID == allot.ID && t.HospitalId == allot.HospitalId);
             if (delHistotyData && drugTypes != null && drugTypes.Any())
                 flag = _drugtypeRepository.RemoveRange(drugTypes.ToArray());
             if (flag || drugTypes == null || !drugTypes.Any())
             {
-                drugTypes = _drugtypeRepository.GetEntities(t => t.AllotID == prevAllotId) ?? _drugtypeRepository.GetEntities(t => t.AllotID == -1);
+                drugTypes = _drugtypeRepository.GetEntities(t => t.AllotID == prevAllotId && t.HospitalId == allot.HospitalId) ?? _drugtypeRepository.GetEntities(t => t.AllotID == -1);
                 if (drugTypes != null && drugTypes.Any())
                 {
                     var newDrugTypes = drugTypes.Select(t => new cof_drugtype { HospitalId = allot.HospitalId, AllotID = allot.ID, Charge = t.Charge, ChargeType = t.ChargeType });
@@ -1075,12 +1075,13 @@ public void CopyCommand(per_allot allot, int prevAllotId, bool delHistotyData =
             }
 
             logger.LogInformation($"copy drugTypeDisburses");
-            var drugTypeDisburses = drugtypeDisburseRepository.GetEntities(t => t.AllotID == allot.ID);
+            var drugTypeDisburses = drugtypeDisburseRepository.GetEntities(t => t.AllotID == allot.ID && t.HospitalId == allot.HospitalId);
             if (delHistotyData && drugTypeDisburses != null && drugTypeDisburses.Any())
                 flag = drugtypeDisburseRepository.RemoveRange(drugTypeDisburses.ToArray());
             if (flag || drugTypeDisburses == null || !drugTypeDisburses.Any())
             {
-                drugTypeDisburses = drugtypeDisburseRepository.GetEntities(t => t.AllotID == prevAllotId) ?? drugtypeDisburseRepository.GetEntities(t => t.AllotID == -1);
+                drugTypeDisburses = drugtypeDisburseRepository.GetEntities(t => t.AllotID == prevAllotId && t.HospitalId == allot.HospitalId)
+                    ?? drugtypeDisburseRepository.GetEntities(t => t.AllotID == -1);
                 if (drugTypeDisburses != null && drugTypeDisburses.Any())
                 {
                     var newDrugTypeDisburses = drugTypeDisburses.Select(t => new cof_drugtype_disburse { HospitalId = allot.HospitalId, AllotID = allot.ID, Charge = t.Charge, ChargeType = t.ChargeType });
@@ -1089,12 +1090,13 @@ public void CopyCommand(per_allot allot, int prevAllotId, bool delHistotyData =
             }
 
             logger.LogInformation($"copy drugTypeFactors");
-            var drugTypeFactors = cofdrugtypefactorRepository.GetEntities(t => t.AllotID == allot.ID);
+            var drugTypeFactors = cofdrugtypefactorRepository.GetEntities(t => t.AllotID == allot.ID && t.HospitalId == allot.HospitalId);
             if (delHistotyData && drugTypeFactors != null && drugTypeFactors.Any())
                 flag = cofdrugtypefactorRepository.RemoveRange(drugTypeFactors.ToArray());
             if (flag || drugTypeFactors == null || !drugTypeFactors.Any())
             {
-                drugTypeFactors = cofdrugtypefactorRepository.GetEntities(t => t.AllotID == prevAllotId) ?? cofdrugtypefactorRepository.GetEntities(t => t.AllotID == -1);
+                drugTypeFactors = cofdrugtypefactorRepository.GetEntities(t => t.AllotID == prevAllotId && t.HospitalId == allot.HospitalId)
+                    ?? cofdrugtypefactorRepository.GetEntities(t => t.AllotID == -1);
                 if (drugTypeFactors != null && drugTypeFactors.Any())
                 {
                     var newDrugtypeFactors = drugTypeFactors.Select(t => new cof_drugtype_factor
@@ -1135,7 +1137,14 @@ public void CopyCommand(per_allot allot, int prevAllotId, bool delHistotyData =
                 if (agains != null && agains.Any())
                 {
                     var days = DateTime.DaysInMonth(allot.Year, allot.Month);
-                    var newAgains = agains.Select(t => new cof_again { AllotID = allot.ID, Type = t.Type, Department = t.Department, TypeName = t.TypeName, Value = t.TypeName == "满勤天数" ? days : t.Value });
+                    var newAgains = agains.Select(t => new cof_again
+                    {
+                        AllotID = allot.ID,
+                        Type = t.Type,
+                        Department = t.Department,
+                        TypeName = t.TypeName,
+                        Value = t.TypeName == "满勤天数" ? days : t.Value
+                    });
                     _againRepository.AddRange(newAgains.ToArray());
                 }
             }