Commit f25896dcbfde87312d59e730eda8246b2e7361dd
1 parent
c863267faa
Exists in
master
and in
6 other branches
威海分娩记录导出修改
Showing 2 changed files with 9 additions and 9 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
View file @
f25896d
| ... | ... | @@ -231,7 +231,7 @@ |
| 231 | 231 | |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - public static void writeWhExclFile(String filePath,OutputStream out,List<Map<String,Object>> values) { | |
| 234 | + public static void writeWhExclFile(String filePath,OutputStream out,List<Map<String,String>> 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 @
f25896d
| ... | ... | @@ -303,22 +303,22 @@ |
| 303 | 303 | // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 |
| 304 | 304 | @SuppressWarnings("unchecked") |
| 305 | 305 | List<ChildbirthManagerQueryModel> childbirthManagerQueryModelList = matDeliverFacade.childbirthManager(childbirthManagerRequest).getData(); |
| 306 | - List<Map<String, Object>> list = new LinkedList<>(); | |
| 306 | + List<Map<String, String>> 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, Object> map = new LinkedHashMap<>(); | |
| 312 | - map.put("num",num); | |
| 311 | + Map<String, String> map = new LinkedHashMap<>(); | |
| 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().toString()); | |
| 316 | + map.put("zyNo",queryModel.getBhnum()); | |
| 317 | 317 | }else { |
| 318 | 318 | map.put("zyNo", "-"); |
| 319 | 319 | } |
| 320 | 320 | map.put("name",queryModel.getName()); |
| 321 | - map.put("age", queryModel.getAge()); | |
| 321 | + map.put("age", String.valueOf(queryModel.getAge())); | |
| 322 | 322 | //居住地 |
| 323 | 323 | String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), |
| 324 | 324 | patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); |
| 325 | 325 | |
| ... | ... | @@ -348,12 +348,12 @@ |
| 348 | 348 | if(null == queryModel.getGravidity()){ |
| 349 | 349 | map.put("yc",""); |
| 350 | 350 | }else{ |
| 351 | - map.put("yc",queryModel.getGravidity()); | |
| 351 | + map.put("yc",String.valueOf(queryModel.getGravidity())); | |
| 352 | 352 | } |
| 353 | 353 | if(null == queryModel.getDueCount()){ |
| 354 | 354 | map.put("cc",""); |
| 355 | 355 | }else{ |
| 356 | - map.put("cc",queryModel.getDueCount()); | |
| 356 | + map.put("cc",String.valueOf(queryModel.getDueCount())); | |
| 357 | 357 | } |
| 358 | 358 | map.put("week",queryModel.getDueWeek()); |
| 359 | 359 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); |
| ... | ... | @@ -460,7 +460,7 @@ |
| 460 | 460 | map.put("deliveryMode3", reslult3); |
| 461 | 461 | map.put("deliveryMode4",reslult4); |
| 462 | 462 | map.put("deliveryMode5",reslult5); |
| 463 | - map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL()); | |
| 463 | + map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : String.valueOf(queryModel.getThloseBloodL())); | |
| 464 | 464 | map.put("sex",queryModel.getSex()); |
| 465 | 465 | map.put("height",queryModel.getBabyHeight()); |
| 466 | 466 | int nu = 0; |