yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2026-01-09 11:29:05 +08:00
parent 65aaa935f6 7dbc591550
commit fe034751b8
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java
View File

@ -8,6 +8,7 @@ import com.nu.modules.care.api.ICareDirectivePlanApi;
import com.nu.modules.order.api.IDirectiveOrderApi; import com.nu.modules.order.api.IDirectiveOrderApi;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@ -264,6 +265,13 @@ public class CareDirectiveApi {
List<DirectiveOrderEntity> current = Lists.newArrayList(); List<DirectiveOrderEntity> current = Lists.newArrayList();
List<DirectiveOrderEntity> future = Lists.newArrayList(); List<DirectiveOrderEntity> future = Lists.newArrayList();
List<DirectiveOrderEntity> all = Lists.newArrayList(); List<DirectiveOrderEntity> all = Lists.newArrayList();
if (StringUtils.isBlank(dto.getElderId()) || StringUtils.isBlank(dto.getNuId()) || dto.getQueryDate() == null) {
result.put("history", history);
result.put("current", current);
result.put("future", future);
result.put("all", all);
return Result.OK(result);
}
//历史 //历史
history = directiveOrderApi.queryHistory(dto); history = directiveOrderApi.queryHistory(dto);

10
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
View File

@ -224,13 +224,13 @@
p.type_id, p.type_id,
p.type_name, p.type_name,
CASE CASE
WHEN p.iz_package = 'Y' THEN p.directive_id WHEN p.iz_package = 'N' THEN p.directive_name
ELSE NULL ELSE directive_name
END AS directive_id, END AS directive_name,
CASE CASE
WHEN p.iz_package = 'Y' THEN p.directive_name WHEN p.iz_package = 'Y' THEN p.directive_name
ELSE NULL ELSE directive_name
END AS directive_name, END AS package_name,
p.preview_file, p.preview_file,
p.net_preview_file, p.net_preview_file,
p.preview_file_small, p.preview_file_small,