From 7836084cd42edb6d8baeb246ce5f31f55ac914c7 Mon Sep 17 00:00:00 2001 From: haorp <754760654@qq.com> Date: Thu, 12 Jun 2025 09:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ApplyScreeningFacade.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index 6f2ce1c..1855f2e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.exception.BusinessException; @@ -529,7 +530,10 @@ public class ApplyScreeningFacade { for (MedicalRecordVo recordVo : medicalRecordVoList) { ApplyScreeningOutResult screeningOutResult = new ApplyScreeningOutResult(); screeningOutResult.setName(recordVo.getName()); - screeningOutResult.setAge("1"); + String age1 = recordVo.getAge().substring(0,8); + Date date = DateUtil.parseYYYYMMDD(age1); + int age = DateUtil.getYearSpace(new Date(),date); + screeningOutResult.setAge(String.valueOf(age)); screeningOutResult.setCardNo(recordVo.getCardNo()); screeningOutResult.setDueWeek(recordVo.getDeliveryTime()); screeningOutResult.setPhone(recordVo.getPhone()); @@ -569,8 +573,8 @@ public class ApplyScreeningFacade { applyScreeningService.queryReferralApplyScreeningWithQuery(query); if (CollectionUtils.isNotEmpty(screeningModels)){ screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment()); - screeningOutResult.setCreated(screeningModels.get(0).getCreated().toString()); - screeningOutResult.setReceived(screeningModels.get(0).getCreated().toString()); + screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated())); + screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived())); screeningOutResult.setRecDoctor(screeningModels.get(0).getRecDoctor()); screeningOutResult.setId(screeningModels.get(0).getId()); screeningOutResult.setPid(screeningModels.get(0).getPid()); @@ -579,7 +583,12 @@ public class ApplyScreeningFacade { data.add(screeningOutResult); } } - return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + PageInfo pageInfo = new PageInfo(); + pageInfo.setCount(medicalRecordVo.getCount()); + pageInfo.setPage(medicalRecordVo.getPage()); + pageInfo.setLimit(medicalRecordVo.getLimit()); + pageInfo.setLastPage(medicalRecordVo.getLastPage()); + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(pageInfo); } private List queryRiskListName(List l) { -- 1.8.3.1