|
@@ -5,6 +5,7 @@ import com.diagbot.dto.PushDTO;
|
|
|
import com.diagbot.facade.DiseaseConfigFacade;
|
|
|
import com.diagbot.facade.DrugConfigFacade;
|
|
|
import com.diagbot.facade.LisConfigFacade;
|
|
|
+import com.diagbot.facade.NurseConfigFacade;
|
|
|
import com.diagbot.facade.OperationConfigFacade;
|
|
|
import com.diagbot.facade.PacsConfigFacade;
|
|
|
import com.diagbot.facade.ScaleConfigFacade;
|
|
@@ -43,6 +44,8 @@ public class AssemblePushAggregate {
|
|
|
private OperationConfigFacade operationConfigFacade;
|
|
|
@Autowired
|
|
|
private ScaleConfigFacade scaleConfigFacade;
|
|
|
+ @Autowired
|
|
|
+ private NurseConfigFacade nurseConfigFacade;
|
|
|
|
|
|
@DataProvider("assemblePushAll")
|
|
|
public PushDTO assemblePushAll(
|
|
@@ -227,4 +230,27 @@ public class AssemblePushAggregate {
|
|
|
}
|
|
|
return retScale;
|
|
|
}
|
|
|
+
|
|
|
+ @DataProvider("retNurse")
|
|
|
+ public List<PushBaseDTO> retNurse(@InvokeParameter("pushDTO") PushDTO data,
|
|
|
+ @InvokeParameter("hospitalId") Long hospitalId) {
|
|
|
+ //量表
|
|
|
+ List<PushBaseDTO> retNurse = new ArrayList<>();
|
|
|
+ if (ListUtil.isNotEmpty(data.getNurse())) {
|
|
|
+ retNurse = data.getNurse();
|
|
|
+ List<String> uniqueNameList = retNurse.stream()
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ Map<String, Map<String, Long>> uniqueNameMap
|
|
|
+ = nurseConfigFacade.getUniqueNameConfigMap(hospitalId, null, uniqueNameList);
|
|
|
+ if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
|
|
|
+ retNurse.forEach(item -> {
|
|
|
+ if (uniqueNameMap.get(item.getName()) != null) {
|
|
|
+ item.setHisNameList(new ArrayList<>(uniqueNameMap.get(item.getName()).keySet()));
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return retNurse;
|
|
|
+ }
|
|
|
}
|