From 60b57d9bd86a38787e04e07151c6fb4bd25c14db Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 12 Jul 2016 10:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 40 ++++++++++++++++------ .../operate/web/result/QuanChanResult.java | 9 +++++ 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index d69e5a2..639e6db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -8,10 +8,10 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.CommunityConfig; import com.lyms.platform.pojo.Patients; @@ -22,6 +22,7 @@ import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -216,39 +217,56 @@ public class PatientFacade { data = convertToQuanPatient(patientses); //处理全部产妇 } else if (type == 3) { - data=convertToQuanCPatient(patientses); + data = convertToQuanCPatient(patientses); } } return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); } - public BaseResponse findPatient(PatientQueryRequest patientQueryRequest){ - PatientsQuery patientsQuery=new PatientsQuery(); + public BaseResponse findPatient(PatientQueryRequest patientQueryRequest) { + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(patientQueryRequest.getId()); patientsQuery.setPhone(patientQueryRequest.getPhone()); patientsQuery.setCardNo(patientQueryRequest.getCardNo()); - Patients patients= patientsService.findOnePatientByCardNo(patientsQuery); - PatientBaseResult patientBaseResult=new PatientBaseResult(); - if(null!=patients){ + Patients patients = patientsService.findOnePatientByCardNo(patientsQuery); + PatientBaseResult patientBaseResult = new PatientBaseResult(); + if (null != patients) { patientBaseResult.convert(patients); } try { patientBaseResult.setRiskFactor(antenatalExaminationFacade.queryRisk(patients.getFirstRiskFactorId())); - }catch (Exception e){} + } catch (Exception e) { + } return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } + /** * 转成全部产妇的返回数据 * * @param patientses 符合条件的产妇 * @return */ - private List convertToQuanCPatient(List patientses){ + private List convertToQuanCPatient(List patientses) { List data = new ArrayList<>(); + AntExChuQuery antExChuQuery = new AntExChuQuery(); + AntExQuery antExQuery = new AntExQuery(); for (Patients patients : patientses) { - QuanChanResult chanResult =new QuanChanResult(); + QuanChanResult chanResult = new QuanChanResult(); chanResult.convertToResult(patients); + antExQuery.setParentId(patients.getId()); + antExQuery.setYn(YnEnums.YES.getId()); + //复诊次数 + int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + chanResult.setcTime(i + ""); + antExChuQuery.setParentId(patients.getId()); + antExChuQuery.setYn(YnEnums.YES.getId()); + List ant = antExService.queryAntenatalExamination(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + String nextCheckTime = ""; + if (CollectionUtils.isNotEmpty(ant)) { + nextCheckTime = ant.get(0).getNextCheckTime(); + } + chanResult.setNextCheckTime(nextCheckTime); data.add(chanResult); } return data; @@ -262,6 +280,8 @@ public class PatientFacade { for (Patients patients : patientses) { QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); quanPatientsResult.convertToResult(patients); + antExQuery.setParentId(patients.getId()); + antExQuery.setYn(YnEnums.YES.getId()); //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); antExChuQuery.setParentId(patients.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index 04fb4b3..7f61238 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -29,6 +29,15 @@ public class QuanChanResult implements IBasicResultConvert