Commit 8b8dfb45cdd7e3c217e197406ef9c9560e441fb3
1 parent
c89e3b1429
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 15 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
8b8dfb4
| ... | ... | @@ -918,7 +918,7 @@ |
| 918 | 918 | mapData.put("data", results); |
| 919 | 919 | // 是否在本医院所在区域建档 |
| 920 | 920 | mapData.put("rBType", count > 0); |
| 921 | - mapData.put("pid",pid); | |
| 921 | + mapData.put("pid", pid); | |
| 922 | 922 | mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); |
| 923 | 923 | list.add(mapData); |
| 924 | 924 | |
| ... | ... | @@ -1668,7 +1668,7 @@ |
| 1668 | 1668 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 1669 | 1669 | patientsQuery.setId(parentId); |
| 1670 | 1670 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 1671 | - patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); | |
| 1671 | +// patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); //bug 玉田中医院打印产检报告报服务器异常-见截图 | |
| 1672 | 1672 | PregnantInfoResult result = new PregnantInfoResult(); |
| 1673 | 1673 | SimplePregnantResult patientResult = new SimplePregnantResult(); |
| 1674 | 1674 | List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 1675 | 1675 | |
| ... | ... | @@ -1718,18 +1718,20 @@ |
| 1718 | 1718 | patientResult.setHusbandPhone(result.getHusbandPhone()); |
| 1719 | 1719 | } |
| 1720 | 1720 | // 增加初诊信息，桓台医院打印使用 |
| 1721 | - AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 1722 | - antExChuQuery.setParentId(patientResult.getId()); | |
| 1723 | - antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 1724 | - List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 1725 | - if (CollectionUtils.isNotEmpty(antExChuModels)) { | |
| 1726 | - AntExChuModel antExChuModel = antExChuModels.get(0); | |
| 1727 | - patientResult.setPregnancyTimes(antExChuModel.getPregnancyTimes()); | |
| 1728 | - patientResult.setProdTime(antExChuModel.getProdTime()); | |
| 1729 | - patientResult.setDelivery(antExChuModel.getDelivery()); | |
| 1730 | - patientResult.setPlanedProd(antExChuModel.getPlanedProd()); | |
| 1721 | + if (StringUtils.isNotEmpty(patientResult.getId())) | |
| 1722 | + { | |
| 1723 | + AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 1724 | + antExChuQuery.setParentId(patientResult.getId()); | |
| 1725 | + antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 1726 | + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 1727 | + if (CollectionUtils.isNotEmpty(antExChuModels)) { | |
| 1728 | + AntExChuModel antExChuModel = antExChuModels.get(0); | |
| 1729 | + patientResult.setPregnancyTimes(antExChuModel.getPregnancyTimes()); | |
| 1730 | + patientResult.setProdTime(antExChuModel.getProdTime()); | |
| 1731 | + patientResult.setDelivery(antExChuModel.getDelivery()); | |
| 1732 | + patientResult.setPlanedProd(antExChuModel.getPlanedProd()); | |
| 1733 | + } | |
| 1731 | 1734 | } |
| 1732 | - | |
| 1733 | 1735 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 1734 | 1736 | objectResponse.setData(patientResult); |
| 1735 | 1737 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |