jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 87d431a0f766a6df16ceedee5145794935a57add

Authored by gengxiaokai
1 parent a73d4fd670
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

婚检导出

Showing 1 changed file with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 87d431a
... ... @@ -976,7 +976,7 @@
976 976 if (request.getSexType()==1){
977 977 womenExport(out,list,data,response);
978 978 }else if (request.getSexType()==2){
979   - menExport(out,list,data,response);
  979 + womenExport(out,list,data,response);
980 980 }
981 981 }catch (Exception e){
982 982 e.printStackTrace();
... ... @@ -995,7 +995,6 @@
995 995 for (PremaritalCheckup checkup : data) {
996 996 Map<String, Object> map = new HashMap<>();
997 997 map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime()));
998   - if (checkup.getSexType() == one) {
999 998  
1000 999 String username = "";
1001 1000 String phone = "";
... ... @@ -1021,7 +1020,8 @@
1021 1020 }
1022 1021 }
1023 1022 map.put("username", username);
1024   - map.put("certificateNum", FunvCommonUtil.getId(certificateNum));
  1023 + //map.put("certificateNum", FunvCommonUtil.getId(certificateNum));
  1024 + map.put("certificateNum", certificateNum);
1025 1025 map.put("phone", phone);
1026 1026 if(null != checkup.getJianChaJieGuo()){
1027 1027 if(2 == checkup.getJianChaJieGuo()){
... ... @@ -1058,7 +1058,7 @@
1058 1058 }
1059 1059 map.put("hunJianDoctor", hunJianDoctor);
1060 1060 list.add(map);
1061   - }
  1061 +
1062 1062 }
1063 1063 out = response.getOutputStream();
1064 1064 Map<String, String> cnames = new LinkedHashMap<>();