jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ed0e0ca175d99bebf0ee534d7e6d9cc1196652e1

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

威海分娩记录导出修改

Showing 2 changed files with 4 additions and 4 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ ed0e0ca
... ... @@ -231,7 +231,7 @@
231 231  
232 232 }
233 233  
234   - public static void writeWhExclFile(String filePath,OutputStream out,List<Map<String,String>> values) {
  234 + public static void writeWhExclFile(String filePath,OutputStream out,List<Map<String,Object>> values) {
235 235 File file = new File(filePath);
236 236 InputStream in = null;
237 237 Workbook wb = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ ed0e0ca
... ... @@ -303,17 +303,17 @@
303 303 // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
304 304 @SuppressWarnings("unchecked")
305 305 List<ChildbirthManagerQueryModel> childbirthManagerQueryModelList = matDeliverFacade.childbirthManager(childbirthManagerRequest).getData();
306   - List<Map<String, String>> list = new LinkedList<>();
  306 + List<Map<String, Object>> list = new LinkedList<>();
307 307 int num = 0;
308 308 for (ChildbirthManagerQueryModel queryModel : childbirthManagerQueryModelList) {
309 309  
310 310 Patients patients = patientsService.findOnePatientById(queryModel.getPatientId());
311   - Map<String, String> map = new LinkedHashMap<>();
  311 + Map<String, Object> map = new LinkedHashMap<>();
312 312 map.put("num",String.valueOf(num));
313 313 map.put("dueDate",queryModel.getDueDate());
314 314 map.put("fmTime",queryModel.getFmTime());
315 315 if(StringUtils.isNotEmpty(queryModel.getBhnum())){
316   - map.put("zyNo",queryModel.getBhnum());
  316 + map.put("zyNo","00009");
317 317 }else {
318 318 map.put("zyNo", "-");
319 319 }