jiangjiazhi / regional-platform

Download as
Browse Code »

Commit dfbe6e748b7cff24bcef5da765e23e29c857f268

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

bug修复

Showing 1 changed file with 4 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ dfbe6e7
... ... @@ -1039,7 +1039,7 @@
1039 1039 * 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数
1040 1040 */
1041 1041 Integer type = (Integer) param.get("type");
1042   - if(type == null) type = 1;
  1042 + if(type == null) type = 4;
1043 1043 if(exportType == 1 && type == 1) { /** 孕期发放人数 */
1044 1044 exportPregnancy(couponInfos == null ? userSendInfos : couponInfos, response);
1045 1045 } else if(exportType == 1) { /** 孕期使用券数 */
... ... @@ -1137,6 +1137,7 @@
1137 1137 Map<String, Object> result = new LinkedHashMap<>();
1138 1138 result.put("id", ++i);
1139 1139 result.put("phone", m.get("phone"));
  1140 + result.put("use_date", m.get("use_date"));
1140 1141 result.put("username", m.get("username"));
1141 1142 result.put("week", m.get("week"));
1142 1143 result.put("type_desc", m.get("type_desc"));
... ... @@ -1220,8 +1221,8 @@
1220 1221 cnames.put("username", "姓名");
1221 1222 cnames.put("send_hospital", "发放机构");
1222 1223 cnames.put("doctoer_name", "发放医生");
1223   - cnames.put("householdAddress", "居住地");
1224   - cnames.put("residenceAddress", "户籍地");
  1224 + cnames.put("residenceAddress", "居住地");
  1225 + cnames.put("householdAddress", "户籍地");
1225 1226 cnames.put("phone", "联系电话");
1226 1227  
1227 1228 List<Map<String,Object>> results = new ArrayList<>();