Browse Source

修复 结束管理没有撤泵人信息

18339543638 2 years ago
parent
commit
1e3164ecc0

+ 11 - 8
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusInfusionHistoryService.java

@@ -157,15 +157,18 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
      */
     @Transactional(rollbackFor = Exception.class)
     public void batchUndo(List<ManualUndoConfig> undoConfigs,boolean finishClinic){
-        if(!finishClinic){
-            undoConfigs.forEach(undoConfig -> this.undo(undoConfig,false));
-        }else {
-            //批量结束临床
-            Map<String, List<ManualUndoConfig>> configsMap = undoConfigs.stream().collect(Collectors.groupingBy(ManualUndoConfig::getTenantId));
-            configsMap.forEach((tenantId,undoConfig)-> {
-                clinicService.finish(undoConfig.stream().map(ManualUndoConfig::getClinicId).collect(Collectors.toList()),undoConfig.get(0).getUndo().getUndoTime() ,tenantId);
-            });
+//        if(!finishClinic){
+        if(CollectionUtil.size(undoConfigs)>50){
+            throw new CustomException("一次性结束管理数量不能超过50个");
         }
+            undoConfigs.forEach(undoConfig -> this.undo(undoConfig,finishClinic));
+//        }else {
+//            //批量结束临床
+//            Map<String, List<ManualUndoConfig>> configsMap = undoConfigs.stream().collect(Collectors.groupingBy(ManualUndoConfig::getTenantId));
+//            configsMap.forEach((tenantId,undoConfig)-> {
+//                clinicService.finish(undoConfig.stream().map(ManualUndoConfig::getClinicId).collect(Collectors.toList()),undoConfig.get(0).getUndo().getUndoTime() ,tenantId);
+//            });
+//        }
     }
 
     /**