From 87d431a0f766a6df16ceedee5145794935a57add Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Thu, 11 Oct 2018 17:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index c13efe6..ada7691 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -976,7 +976,7 @@ public class PremaritalCheckupFacade { if (request.getSexType()==1){ womenExport(out,list,data,response); }else if (request.getSexType()==2){ - menExport(out,list,data,response); + womenExport(out,list,data,response); } }catch (Exception e){ e.printStackTrace(); @@ -995,7 +995,6 @@ public class PremaritalCheckupFacade { for (PremaritalCheckup checkup : data) { Map map = new HashMap<>(); map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); - if (checkup.getSexType() == one) { String username = ""; String phone = ""; @@ -1021,7 +1020,8 @@ public class PremaritalCheckupFacade { } } map.put("username", username); - map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); + //map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); + map.put("certificateNum", certificateNum); map.put("phone", phone); if(null != checkup.getJianChaJieGuo()){ if(2 == checkup.getJianChaJieGuo()){ @@ -1058,7 +1058,7 @@ public class PremaritalCheckupFacade { } map.put("hunJianDoctor", hunJianDoctor); list.add(map); - } + } out = response.getOutputStream(); Map cnames = new LinkedHashMap<>(); -- 1.8.3.1