From 7d1cd0dabb2e760baeb3653466179936807ec532 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Thu, 13 Dec 2018 11:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=AD=9B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabySieveFacede.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 9d24b69..2a2b35a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -970,7 +970,23 @@ public class BabySieveFacede { query.setTestNumber(testNum); List list = babySieveService.queryNewSieveLab(query); if(list != null && list.size() > 0){ - br.setData(list); + NewSieveLabModel newSieveLabModel = new NewSieveLabModel(); + newSieveLabModel.setTestNumber(list.get(0).getTestNumber()); + newSieveLabModel.setNtshsyingguang(list.get(0).getNtshsyingguang()); + newSieveLabModel.setNtshsnongdu(list.get(0).getNtshsnongdu()); + newSieveLabModel.setPkuhyingguang(list.get(0).getPkuhyingguang()); + newSieveLabModel.setPkuhnongdu(list.get(0).getPkuhnongdu()); + if(list != null && list.size() > 1){ + if(StringUtils.isEmpty(newSieveLabModel.getNtshsyingguang()) && StringUtils.isEmpty(newSieveLabModel.getNtshsnongdu())){ + newSieveLabModel.setNtshsyingguang(list.get(1).getNtshsyingguang()); + newSieveLabModel.setNtshsnongdu(list.get(1).getNtshsnongdu()); + }else{ + newSieveLabModel.setPkuhyingguang(list.get(1).getPkuhyingguang()); + newSieveLabModel.setPkuhnongdu(list.get(1).getPkuhnongdu()); + } + } + + br.setData(newSieveLabModel); br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); return br; } -- 1.8.3.1