From 3f52a6b05ca40ea165565c2af4f2f4a76c147c77 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 1 Aug 2016 11:49:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/AntenatalExaminationService.java | 2 +- .../operate/web/facade/AntenatalExaminationFacade.java | 2 +- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 13 +++++++++++++ .../platform/operate/web/facade/StopPregnancyFacade.java | 2 +- .../lyms/platform/operate/web/result/AntexListResult.java | 8 +++++--- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index 75220a7..f7d09f7 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -126,7 +126,7 @@ public class AntenatalExaminationService { } public List queryAntExChu(AntExChuQuery antExChuQuery){ - return iAntExChuDao.query(antExChuQuery.convertToQuery()); + return iAntExChuDao.query(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created")); } public List queryYuyueAntenatalExamination(Date yuYueDate,String hospitalId) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e9d2e79..ca91f73 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -416,7 +416,7 @@ public class AntenatalExaminationFacade { data = queryRiskName(l); } - antexListResult.convertToResult(list, patients, antExChuModel); + antexListResult.convertToResult(list, patients, antExChulist); antexListResult.setIsSieve(cap(patients.getLastMenses(),patients.getId())); antexListResult.setRiskFactor(data); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index af68308..345b844 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -134,6 +134,19 @@ public class MatDeliverFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + private BabyModel fillBaby(Patients patients){ + BabyModel babyModel=new BabyModel(); + babyModel.setAreaId(patients.getAreaId()); + babyModel.setProvinceId(patients.getProvinceId()); + babyModel.setCityId(patients.getCityId()); + babyModel.setMname(patients.getUsername()); + babyModel.setMjob(patients.getPworkUnit()); + babyModel.setMphone(patients.getPhone()); + babyModel.setMbirth(patients.getBirth()); + babyModel.setFjob(patients.getHworkUnit()); + babyModel.setFphone(patients.getHusbandPhone()); + return babyModel; + } /** * 处理儿童 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 313b403..597f375 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -197,7 +197,7 @@ public class StopPregnancyFacade { data = queryRiskName(l); } - antexListResult.convertToResult(list, patients, antExChuModel); + antexListResult.convertToResult(list, patients, antExChulist); antexListResult.setRiskFactor(data); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 41d201c..443a871 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -145,7 +145,7 @@ public class AntexListResult { this.yChanQi = yChanQi; } - public AntexListResult convertToResult(List destModel,Patients patients,AntExChuModel antExChuModel) { + public AntexListResult convertToResult(List destModel,Patients patients,List antExChuModel) { setId(patients.getId()); try { if(null!=patients.getBirth()){ @@ -171,8 +171,10 @@ public class AntexListResult { setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } List dataList = new ArrayList<>(); - if(null!=antExChuModel){ - dataList.add(new AntData(antExChuModel,"")); + if(CollectionUtils.isNotEmpty(antExChuModel)){ + for(AntExChuModel antExChuModel1:antExChuModel){ + dataList.add(new AntData(antExChuModel1,"")); + } } if(CollectionUtils.isNotEmpty(destModel)){ for(AntenatalExaminationModel model:destModel){ -- 1.8.3.1