From ddf437b89964556afb91bc803015aa33b2ea396c Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Thu, 8 Nov 2018 10:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=90=E5=B1=B1=E5=A4=8D=E8=AF=8A=E9=9A=8F?= =?UTF-8?q?=E8=AE=BF=E8=A1=A8=E6=89=93=E5=8D=B0=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/ViewFacade.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index b034e98..b8c0319 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -511,7 +511,6 @@ public class ViewFacade { */ public List> prFuData(String id, int num, Integer userId) { List> mList = new ArrayList>(); - List list = null; //Map map = new HashedMap(); AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4]; AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id); @@ -533,9 +532,12 @@ public class ViewFacade { antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setParentId(patientsId); //复诊 - list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate")); + List list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate")); if(list != null && list.size() > 0){ - + exData[0] = list.get(0); + exData[1] = list.get(1); + exData[2] = list.get(2); + exData[3] = list.get(3); }else{ return mList; } @@ -546,10 +548,10 @@ public class ViewFacade { } // Map map = new HashMap<>(); - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < exData.length; i++) { Map map = new HashedMap(); map.put("name",name); - AntenatalExaminationModel data = list.get(i); + AntenatalExaminationModel data = exData[i]; if (data == null) { continue; } -- 1.8.3.1