From f25896dcbfde87312d59e730eda8246b2e7361dd Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Fri, 11 Jan 2019 21:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/utils/ExcelUtil.java | 2 +- .../operate/web/controller/MatDeliverController.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index 8d03156..35ed7ec 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -231,7 +231,7 @@ public class ExcelUtil } - public static void writeWhExclFile(String filePath,OutputStream out,List> values) { + public static void writeWhExclFile(String filePath,OutputStream out,List> values) { File file = new File(filePath); InputStream in = null; Workbook wb = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 0629134..b9e5033 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -303,22 +303,22 @@ public class MatDeliverController extends BaseController{ // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 @SuppressWarnings("unchecked") List childbirthManagerQueryModelList = matDeliverFacade.childbirthManager(childbirthManagerRequest).getData(); - List> list = new LinkedList<>(); + List> list = new LinkedList<>(); int num = 0; for (ChildbirthManagerQueryModel queryModel : childbirthManagerQueryModelList) { Patients patients = patientsService.findOnePatientById(queryModel.getPatientId()); - Map map = new LinkedHashMap<>(); - map.put("num",num); + Map map = new LinkedHashMap<>(); + map.put("num",String.valueOf(num)); map.put("dueDate",queryModel.getDueDate()); map.put("fmTime",queryModel.getFmTime()); if(StringUtils.isNotEmpty(queryModel.getBhnum())){ - map.put("zyNo",queryModel.getBhnum().toString()); + map.put("zyNo",queryModel.getBhnum()); }else { map.put("zyNo", "-"); } map.put("name",queryModel.getName()); - map.put("age", queryModel.getAge()); + map.put("age", String.valueOf(queryModel.getAge())); //居住地 String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); @@ -348,12 +348,12 @@ public class MatDeliverController extends BaseController{ if(null == queryModel.getGravidity()){ map.put("yc",""); }else{ - map.put("yc",queryModel.getGravidity()); + map.put("yc",String.valueOf(queryModel.getGravidity())); } if(null == queryModel.getDueCount()){ map.put("cc",""); }else{ - map.put("cc",queryModel.getDueCount()); + map.put("cc",String.valueOf(queryModel.getDueCount())); } map.put("week",queryModel.getDueWeek()); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); @@ -460,7 +460,7 @@ public class MatDeliverController extends BaseController{ map.put("deliveryMode3", reslult3); map.put("deliveryMode4",reslult4); map.put("deliveryMode5",reslult5); - map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL()); + map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : String.valueOf(queryModel.getThloseBloodL())); map.put("sex",queryModel.getSex()); map.put("height",queryModel.getBabyHeight()); int nu = 0; -- 1.8.3.1