diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 369a9fb..f734cbe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -28,6 +28,7 @@ import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.List; /** @@ -68,11 +69,7 @@ public class PostReviewFacade { } public BaseResponse queryPostList(PostReviewQueryRequest postReviewQueryRequest,Integer userId) { - /*PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setCardNo(postReviewQueryRequest.getCardNo()); - patientsQuery.setVcCardNo(postReviewQueryRequest.getVcCardNo()); - Patients patientsList = patientsService.findOnePatientByCardNo(patientsQuery);*/ + String hospitalId = autoMatchFacade.getHospitalId(userId); //取所有医院的建档数据 优先取本院 ,然后取外院 Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3); @@ -94,7 +91,20 @@ public class PostReviewFacade { } HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getId(),false); + + List dataList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(postReviewModels)){ + String hospitalName=""; + for(PostReviewModel model:postReviewModels){ + Organization organization = organizationService.getOrganization(NumberUtils.toInt(model.getHospitalId())); + if(null!=organization){ + hospitalName=organization.getName(); + } + dataList.add(new PostReviewListResult.AntData(model,hospitalName)); + } + } postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); + postReviewListResult.setData(dataList); postReviewListResult.setRiskFactor(highScoreResult.getHighRisk()); postReviewListResult.setRiskScore(highScoreResult.getScore()+""); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java index d26bf78..acdbadb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java @@ -2,20 +2,16 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.pojo.AntExChuModel; -import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PostReviewModel; -import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; import java.util.Date; import java.util.List; /** - * * 产后复查记录 - * + *

* Created by Administrator on 2016/6/28 0028. */ public class PostReviewListResult { @@ -148,48 +144,64 @@ public class PostReviewListResult { this.yChanQi = yChanQi; } - public PostReviewListResult convertToResult(List destModel,Patients patients,String dueDate) { + public PostReviewListResult convertToResult(List destModel, Patients patients, String dueDate) { setDueDate(dueDate); setId(patients.getId()); try { - if(null!=patients.getBirth()){ + if (null != patients.getBirth()) { setAge(DateUtil.getAge(patients.getBirth())); } - }catch (Exception e){ + } catch (Exception e) { } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); setRiskScore("60"); - if(null!=patients.getDueDate()){ + if (null != patients.getDueDate()) { setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); - this.dueWeek= StringUtils.dueWeek(days); - if(null!=patients.getLastMenses()){ + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + this.dueWeek = StringUtils.dueWeek(days); + if (null != patients.getLastMenses()) { setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } - List dataList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(destModel)){ - for(PostReviewModel model:destModel){ - dataList.add(new AntData(model)); - } - } - setData(dataList); + + setcTime(DateUtil.getyyyy_MM_dd(new Date())); return this; } - private class AntData{ + + public static class AntData { private String dueWeek; private String id; private String checkTime; + private String hospitalName; + private String hospitalId; + + public AntData(PostReviewModel model, String hospitalName) { + this.id = model.getId(); + this.dueWeek = model.getDay(); + this.checkTime = model.getCheckTime(); + this.hospitalId = model.getHospitalId(); + this.hospitalName = hospitalName; + } + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } - public AntData(PostReviewModel model){ - this.id=model.getId(); - this.dueWeek=model.getDay(); - this.checkTime=model.getCheckTime(); + public String getHospitalName() { + return hospitalName; } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + public String getCheckTime() { return checkTime; }