diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java index 0aff6562..b9df12e2 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; @@ -272,6 +273,28 @@ public class CareDirectiveApi { //将来 future = careDirectivePlanApi.queryFuture(dto); } + + //给数据加标识 + if (!CollectionUtils.isEmpty(history)) { + history.stream().forEach(item -> { + if ("Y".equals(item.getIzFinish())) { + item.setExecuteStatus("hisOk"); + } else { + item.setExecuteStatus("hisFaild"); + } + }); + } + if (!CollectionUtils.isEmpty(current)) { + current.stream().forEach(item -> { + item.setExecuteStatus("current"); + }); + } + if (!CollectionUtils.isEmpty(future)) { + future.stream().forEach(item -> { + item.setExecuteStatus("future"); + }); + } + //所有 all.addAll(history); all.addAll(current); diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 3d16226c..51361231 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -131,4 +131,7 @@ public class DirectiveOrderEntity implements Serializable { * 子表信息 */ private List subList; + + // 历史成功hisOk 历史失败hisFaild 正在执行current 待执行future + private String executeStatus; }