Commit 4013532f35aeca42345a918d2006a0e89b77b3ba
1 parent
9b5be348b2
Exists in
master
and in
6 other branches
新生儿管理导出
Showing 3 changed files with 99 additions and 61 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
4013532
| ... | ... | @@ -351,73 +351,87 @@ |
| 351 | 351 | } |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | -// Patients patients = patientsService.findOnePatientById(newBabyManagerQueryModel.getPatientId()); | |
| 355 | -// if (patients != null) | |
| 356 | -// { | |
| 357 | -// map.put("age", DateUtil.getAge(patients.getBirth())); | |
| 358 | -// | |
| 359 | -// //居住地 | |
| 360 | -// String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), | |
| 361 | -// patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); | |
| 362 | -// | |
| 363 | -// map.put("addressRegister",liveAddress); | |
| 364 | -// | |
| 365 | -// //户籍地址 | |
| 366 | -// String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), | |
| 367 | -// patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); | |
| 368 | -// | |
| 369 | -// map.put("addressRegister", addressRegister); | |
| 370 | -// | |
| 371 | -// //产后休养地 | |
| 372 | -// String postRest = CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), | |
| 373 | -// patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService); | |
| 374 | -// map.put("postRest", postRest); | |
| 375 | -// | |
| 376 | -// HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); | |
| 377 | -// //妊娠期高危因素 | |
| 378 | -// map.put("risk", highScoreResult.gethighRiskStr()); | |
| 379 | -// | |
| 380 | -// map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName()); | |
| 381 | -// map.put("husbandName", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); | |
| 382 | -// | |
| 383 | -// AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 384 | -// antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 385 | -// antExChuQuery.setParentId(patients.getId()); | |
| 386 | -// List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 387 | -// if (CollectionUtils.isNotEmpty(antExChuModels)) | |
| 388 | -// { | |
| 389 | -// AntExChuModel antExChuModel = antExChuModels.get(0); | |
| 390 | -// map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes()); | |
| 391 | -// map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); | |
| 392 | -// map.put("ts",antExChuModel.getTireNumber1() == null ? "" : antExChuModel.getTireNumber1()); | |
| 393 | -// } | |
| 394 | -// | |
| 395 | -// if (StringUtils.isNotEmpty(patients.getFmHospital())) | |
| 396 | -// { | |
| 397 | -// Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getFmHospital())); | |
| 398 | -// map.put("fmHospital",organization != null ? organization.getName() : ""); | |
| 399 | -// } | |
| 400 | -// map.put("husbandName", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); | |
| 401 | -// } | |
| 354 | + Integer deformity = newBabyManagerQueryModel.getDeformity(); | |
| 355 | + map.put("jx",deformity == null ? "" : (deformity == 1 ? "是" : "否")); | |
| 402 | 356 | |
| 357 | + Patients patients = patientsService.findOnePatientById(newBabyManagerQueryModel.getPatientId()); | |
| 358 | + if (patients != null) | |
| 359 | + { | |
| 360 | + | |
| 361 | + //居住地 | |
| 362 | + String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), | |
| 363 | + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); | |
| 364 | + | |
| 365 | + map.put("addressRegister",liveAddress); | |
| 366 | + | |
| 367 | + //户籍地址 | |
| 368 | + String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), | |
| 369 | + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); | |
| 370 | + | |
| 371 | + map.put("addressRegister", addressRegister); | |
| 372 | + | |
| 373 | + //产后休养地 | |
| 374 | + String postRest = CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), | |
| 375 | + patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService); | |
| 376 | + map.put("postRest", postRest); | |
| 377 | + | |
| 378 | + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); | |
| 379 | + //妊娠期高危因素 | |
| 380 | + map.put("risk", highScoreResult.gethighRiskStr()); | |
| 381 | + | |
| 382 | + map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName()); | |
| 383 | + map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); | |
| 384 | + | |
| 385 | + AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 386 | + antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 387 | + antExChuQuery.setParentId(patients.getId()); | |
| 388 | + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 389 | + if (CollectionUtils.isNotEmpty(antExChuModels)) | |
| 390 | + { | |
| 391 | + AntExChuModel antExChuModel = antExChuModels.get(0); | |
| 392 | + map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes()); | |
| 393 | + map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); | |
| 394 | + map.put("ts",antExChuModel.getTireNumber1() == null ? "" : antExChuModel.getTireNumber1()); | |
| 395 | + } | |
| 396 | + | |
| 397 | + if (StringUtils.isNotEmpty(patients.getFmHospital())) | |
| 398 | + { | |
| 399 | + Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getFmHospital())); | |
| 400 | + map.put("fmHospital",organization != null ? organization.getName() : ""); | |
| 401 | + } | |
| 402 | + | |
| 403 | + map.put("mremark", patients.getMremark() == null ? "" : patients.getMremark()); | |
| 404 | + } | |
| 405 | + | |
| 403 | 406 | list.add(map); |
| 404 | 407 | } |
| 405 | 408 | Map<String, String> header = new LinkedHashMap<>(); |
| 406 | - header.put("birthYMD", "分娩日期"); | |
| 407 | - header.put("birthHM", "娩出时间"); | |
| 408 | - header.put("name", "姓名"); | |
| 409 | - header.put("sex", "性别"); | |
| 410 | - header.put("birthDays", "出生天数"); | |
| 411 | - header.put("highRisk", "是否高危"); | |
| 412 | - header.put("dueWeek", "分娩孕周"); | |
| 413 | - header.put("dueType", "分娩方式"); | |
| 414 | - header.put("babyHeight", "出生身长/cm"); | |
| 415 | - header.put("babyWeight", "出生体重/g"); | |
| 416 | - header.put("mname", "母亲姓名"); | |
| 417 | - header.put("age", "母亲年龄"); | |
| 418 | - header.put("mcertNo", "母亲证件号"); | |
| 409 | + header.put("mname", "产妇姓名"); | |
| 410 | + header.put("age", "年龄"); | |
| 411 | + header.put("name", "儿童姓名"); | |
| 412 | + header.put("sex", "新生儿性别"); | |
| 413 | + header.put("babyHeight", "身长cm"); | |
| 414 | + header.put("babyWeight", "体重g"); | |
| 415 | + header.put("fmDate", "出生时间(具体到分)"); | |
| 416 | + header.put("addressRegister", "产妇户籍地"); | |
| 417 | + header.put("addressRegister","居住地"); | |
| 418 | + header.put("postRest", "产后休养地址"); | |
| 419 | + header.put("risk", "妊娠期高危因素"); | |
| 419 | 420 | header.put("mphone", "联系方式"); |
| 421 | + header.put("mcertNo", "母亲证件号"); | |
| 422 | + header.put("husbandName", "丈夫姓名"); | |
| 423 | + header.put("husbandPhone", "丈夫联系电话"); | |
| 424 | + header.put("yc","孕次"); | |
| 425 | + header.put("cc","产次"); | |
| 426 | + header.put("ts","胎数"); | |
| 427 | + header.put("dueType", "分娩方式"); | |
| 428 | + header.put("dueWeek", "分娩孕周"); | |
| 429 | + header.put("jx", "外观是否正常"); | |
| 420 | 430 | header.put("deliverDoctor", "接生医生"); |
| 431 | + header.put("birthDays", "出生天数"); | |
| 432 | + header.put("highRisk", "是否高危"); | |
| 433 | + header.put("fmHospital","接生医院"); | |
| 434 | + header.put("mremark", "备注"); | |
| 421 | 435 | httpServletResponse.setContentType("application/force-download"); |
| 422 | 436 | httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("新生儿管理.xls").getBytes("UTF-8"), "ISO-8859-1")); |
| 423 | 437 | ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
4013532
| ... | ... | @@ -2494,6 +2494,7 @@ |
| 2494 | 2494 | if (CollectionUtils.isNotEmpty(babies)) { |
| 2495 | 2495 | for (MaternalDeliverModel.Baby baby : babies) { |
| 2496 | 2496 | if (baby.getId() != null && baby.getId().equals(babyModel.getId())) { |
| 2497 | + newBabyManagerQueryModel.setDeformity(baby.getDeformity()); | |
| 2497 | 2498 | String time = baby.getDueTime(); |
| 2498 | 2499 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(time)) { |
| 2499 | 2500 | SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); |
| ... | ... | @@ -2501,6 +2502,7 @@ |
| 2501 | 2502 | Date date = format.parse(time); |
| 2502 | 2503 | newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(date)); |
| 2503 | 2504 | newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(date)); |
| 2505 | + newBabyManagerQueryModel.setFmDate(DateUtil.getyyyy_MM_dd(date) +" "+ new SimpleDateFormat("HH:mm").format(date)); | |
| 2504 | 2506 | } catch (ParseException e) { |
| 2505 | 2507 | ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time); |
| 2506 | 2508 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java
View file @
4013532
| ... | ... | @@ -29,6 +29,9 @@ |
| 29 | 29 | */ |
| 30 | 30 | private String birthHM; |
| 31 | 31 | |
| 32 | + private String fmDate; | |
| 33 | + | |
| 34 | + | |
| 32 | 35 | /** |
| 33 | 36 | * @auther HuJiaqi |
| 34 | 37 | * @createTime 2016年12月08日 10时54分 |
| ... | ... | @@ -134,6 +137,25 @@ |
| 134 | 137 | * @discription 接生医生 |
| 135 | 138 | */ |
| 136 | 139 | private String deliverDoctor; |
| 140 | + | |
| 141 | + //畸形 0非畸形 1畸形 | |
| 142 | + private Integer deformity; | |
| 143 | + | |
| 144 | + public String getFmDate() { | |
| 145 | + return fmDate; | |
| 146 | + } | |
| 147 | + | |
| 148 | + public void setFmDate(String fmDate) { | |
| 149 | + this.fmDate = fmDate; | |
| 150 | + } | |
| 151 | + | |
| 152 | + public Integer getDeformity() { | |
| 153 | + return deformity; | |
| 154 | + } | |
| 155 | + | |
| 156 | + public void setDeformity(Integer deformity) { | |
| 157 | + this.deformity = deformity; | |
| 158 | + } | |
| 137 | 159 | |
| 138 | 160 | public String getApgarScore() { |
| 139 | 161 | return apgarScore; |