Commit fe3971a44cedd09a06c8d56cd99a7cf0e932f39e
1 parent
bf10103835
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 38 additions and 23 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
fe3971a
| ... | ... | @@ -1606,11 +1606,11 @@ |
| 1606 | 1606 | // String end = getyyyy_MM_dd(endDate); |
| 1607 | 1607 | // |
| 1608 | 1608 | // System.out.println(start+"=="+end); |
| 1609 | - Date baby = parseDate("2018-09-26"); | |
| 1609 | + Date baby = parseDate("2019-10-24"); | |
| 1610 | 1610 | |
| 1611 | - Date d = DateUtil.addDay(baby, 294); | |
| 1611 | +// Date d = DateUtil.addDay(baby, 294); | |
| 1612 | 1612 | |
| 1613 | - System.out.println(getyyyy_MM_dd(d)); | |
| 1613 | + System.out.println(baby.getTime()); | |
| 1614 | 1614 | } |
| 1615 | 1615 | |
| 1616 | 1616 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
fe3971a
| ... | ... | @@ -70,6 +70,9 @@ |
| 70 | 70 | private SieveFacade sieveFacade; |
| 71 | 71 | |
| 72 | 72 | @Autowired |
| 73 | + private AntExRecordService recordService; | |
| 74 | + | |
| 75 | + @Autowired | |
| 73 | 76 | private MatDeliverService matDeliverService; |
| 74 | 77 | @Autowired |
| 75 | 78 | private PostReviewService postReviewService; |
| ... | ... | @@ -5491,6 +5494,7 @@ |
| 5491 | 5494 | |
| 5492 | 5495 | List<Map<String, Object>> deliverList = new ArrayList<>(); |
| 5493 | 5496 | List<Patients> list = patientsService.queryPatient1(patientsQuery, "created"); |
| 5497 | + | |
| 5494 | 5498 | if (CollectionUtils.isNotEmpty(list)) { |
| 5495 | 5499 | for (Patients pat : list) { |
| 5496 | 5500 | |
| 5497 | 5501 | |
| 5498 | 5502 | |
| 5499 | 5503 | |
| 5500 | 5504 | |
| 5501 | 5505 | |
| ... | ... | @@ -5505,19 +5509,47 @@ |
| 5505 | 5509 | Map<String, Object> patientMap = new HashMap<>(); |
| 5506 | 5510 | |
| 5507 | 5511 | patientMap.put("mid", pat.getId());// |
| 5508 | - patientMap.put("mbuilddate", DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));// 建档时间 | |
| 5509 | 5512 | |
| 5513 | + | |
| 5514 | + patientMap.put("mbuilddate", DateUtil.getyyyy_MM_dd(list.get(0).getBookbuildingDate()));// 建档时间 | |
| 5515 | + | |
| 5510 | 5516 | String buildHospital = ""; |
| 5511 | - if (StringUtils.isNotEmpty(pat.getHospitalId())) { | |
| 5517 | + if (StringUtils.isNotEmpty(list.get(0).getHospitalId())) { | |
| 5512 | 5518 | Organization organization = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId())); |
| 5513 | 5519 | if (organization != null && organization.getYn() == YnEnums.YES.getId()) { |
| 5514 | 5520 | buildHospital = organization.getName(); |
| 5515 | 5521 | } |
| 5516 | 5522 | } |
| 5517 | 5523 | patientMap.put("mbuildhospital", buildHospital);//建档单位 |
| 5518 | - patientMap.put("mphone", pat.getPhone()); | |
| 5519 | 5524 | |
| 5525 | + AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); | |
| 5526 | + antExRecordQuery1.setCheckTimeStart(pat.getLastMenses()); | |
| 5527 | + antExRecordQuery1.setCheckTimeEnd(pat.getFmDate()); | |
| 5528 | + antExRecordQuery1.setPid(pat.getPid()); | |
| 5529 | + //本产程总产检次数 | |
| 5530 | + int totalCount = recordService.count(antExRecordQuery1); | |
| 5520 | 5531 | |
| 5532 | + patientMap.put("totalCount", totalCount);// 本产程总产检次数 | |
| 5533 | + | |
| 5534 | + Organization organization = null; | |
| 5535 | + String fmHospital = ""; | |
| 5536 | + if (StringUtils.isNotEmpty(datas.get(0).getFmHospital())) { | |
| 5537 | + if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getFmHospital())) { | |
| 5538 | + organization = organizationService.getOrganization(Integer.parseInt(datas.get(0).getFmHospital())); | |
| 5539 | + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { | |
| 5540 | + fmHospital = organization.getName(); | |
| 5541 | + } | |
| 5542 | + } else { | |
| 5543 | + fmHospital = pat.getFmHospital(); | |
| 5544 | + } | |
| 5545 | + | |
| 5546 | + } | |
| 5547 | + patientMap.put("hospital", fmHospital);//接生单位 | |
| 5548 | + | |
| 5549 | + | |
| 5550 | + | |
| 5551 | + patientMap.put("mphone", pat.getPhone()); | |
| 5552 | + | |
| 5521 | 5553 | patientMap.put("mname", pat.getUsername());//母亲姓名 |
| 5522 | 5554 | patientMap.put("mcountry", getBasicConfig(pat.getPcountryId()));//母亲国籍 |
| 5523 | 5555 | patientMap.put("mnation", getBasicConfig(pat.getPnationId()));//母亲民族 |
| ... | ... | @@ -5558,23 +5590,6 @@ |
| 5558 | 5590 | patientMap.put("fcardnum", "");//父亲证件号码 |
| 5559 | 5591 | patientMap.put("faddress", "");//父亲户籍地址 |
| 5560 | 5592 | } |
| 5561 | - | |
| 5562 | - | |
| 5563 | - Organization organization = null; | |
| 5564 | - String fmHospital = ""; | |
| 5565 | - if (StringUtils.isNotEmpty(datas.get(0).getFmHospital())) { | |
| 5566 | - if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getFmHospital())) { | |
| 5567 | - organization = organizationService.getOrganization(Integer.parseInt(datas.get(0).getFmHospital())); | |
| 5568 | - if (organization != null && organization.getYn() == YnEnums.YES.getId()) { | |
| 5569 | - fmHospital = organization.getName(); | |
| 5570 | - } | |
| 5571 | - } else { | |
| 5572 | - fmHospital = pat.getFmHospital(); | |
| 5573 | - } | |
| 5574 | - | |
| 5575 | - } | |
| 5576 | - patientMap.put("hospital", fmHospital);//接生单位 | |
| 5577 | - | |
| 5578 | 5593 | |
| 5579 | 5594 | if (CollectionUtils.isNotEmpty(datas)) { |
| 5580 | 5595 | String deliverDoctor = ""; |