From 8fe1e7f681ff00c186ef78514b351f0abb5206e5 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 22 Sep 2016 17:29:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/service/AntenatalExaminationService.java | 5 +- .../main/java/com/lyms/platform/pojo/Patients.java | 10 + .../com/lyms/platform/query/PatientsQuery.java | 31 +++ .../web/facade/AntenatalExaminationFacade.java | 275 +++++++++++++-------- .../platform/operate/web/facade/PatientFacade.java | 10 + .../web/request/RiskPatientsQueryRequest.java | 11 +- 6 files changed, 238 insertions(+), 104 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 812fc1d..c45ff4d 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 @@ -130,9 +130,12 @@ public class AntenatalExaminationService { } public List queryAntExChu(AntExChuQuery antExChuQuery){ - return iAntExChuDao.query(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created")); + return iAntExChuDao.query(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); } + public List queryAntExChu(MongoQuery mongoQuery){ + return iAntExChuDao.query(mongoQuery); + } public List queryYuyueAntenatalExamination(Date yuYueDate,String hospitalId) { return iAntenatalExaminationDao.queryYuyueAntenatalExamination(yuYueDate, hospitalId); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index ac37f8c..f89207a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -225,6 +225,16 @@ public class Patients extends BaseModel { private String pid; //是否隐藏 0 隐藏 1 显示 private String enable; + //最后一次高危时间 + private Date lastRhTime; + + public Date getLastRhTime() { + return lastRhTime; + } + + public void setLastRhTime(Date lastRhTime) { + this.lastRhTime = lastRhTime; + } public String getEnable() { return enable; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 345f3ba..3408a29 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -76,8 +76,27 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Date bookbuildingDateStart; private Date bookbuildingDateEnd; + private Date lastRhTimeStart; + private Date lastRhTimeEnd; + private String pid; + public Date getLastRhTimeEnd() { + return lastRhTimeEnd; + } + + public void setLastRhTimeEnd(Date lastRhTimeEnd) { + this.lastRhTimeEnd = lastRhTimeEnd; + } + + public Date getLastRhTimeStart() { + return lastRhTimeStart; + } + + public void setLastRhTimeStart(Date lastRhTimeStart) { + this.lastRhTimeStart = lastRhTimeStart; + } + public Date getCreated() { return created; } @@ -636,6 +655,18 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { isAddStart = Boolean.TRUE; } + if(null!=lastRhTimeStart){ + c = Criteria.where("lastRhTime").gte(lastRhTimeStart); + isAddStart = Boolean.TRUE; + } + if (null != lastRhTimeEnd) { + if (isAddStart) { + c = c.lte(lastRhTimeEnd); + } else { + c = Criteria.where("lastRhTime").lte(lastRhTimeEnd); + } + isAddStart = Boolean.TRUE; + } if (null != hScoreStart) { // condition = condition.and("riskScore", hScore, MongoOper.IS); 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 09c6bc0..771140e 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 @@ -17,7 +17,6 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; -import com.sun.tools.corba.se.idl.constExpr.And; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -65,9 +64,10 @@ public class AntenatalExaminationFacade { * @return */ public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); if (StringUtils.isNotEmpty(antExAddRequest.getId())) { AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel(); - antenatalExamination.setHospitalId(autoMatchFacade.matchOrgId(userId).get(0) + ""); + antenatalExamination.setHospitalId(hospitalId); antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId()); //修改申请单状态 updateApplyOrder(antenatalExamination, antExAddRequest.getParentId()); @@ -76,14 +76,15 @@ public class AntenatalExaminationFacade { patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); // updatePatientRiskLevel(antenatalExamination, patients); patientsService.updatePatient(patients); + updateLastRisk(antExAddRequest.getParentId()); + + //修改本院最后一次定义高危 + updateLastRhTime(patients.getId(), hospitalId); } else { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); model.setYn(YnEnums.YES.getId()); - List list1 = autoMatchFacade.matchOrgId(userId); - if (CollectionUtils.isNotEmpty(list1)) { - model.setHospitalId(list1.get(0) + ""); - } + model.setHospitalId(hospitalId); AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setParentId(antExAddRequest.getParentId()); @@ -103,6 +104,9 @@ public class AntenatalExaminationFacade { // updatePatientRiskLevel(model, patients); updateLastRisk(antExAddRequest.getParentId()); + + //修改本院最后一次定义高危 + updateLastRhTime(patients.getId(), hospitalId); if (null != patients.getBuildType() && patients.getBuildType() == 3) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(patients.getId()); @@ -163,8 +167,9 @@ public class AntenatalExaminationFacade { */ public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest, Integer userId) { AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); + String hospitalId = autoMatchFacade.getHospitalId(userId); if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { - antExChuModel.setHospitalId(autoMatchFacade.getHospitalId(userId)); + antExChuModel.setHospitalId(hospitalId); antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); @@ -172,10 +177,12 @@ public class AntenatalExaminationFacade { //修改患者风险等级 // updatePatientRiskLevel(antExChuModel, patients); patientsService.updatePatient(patients); + //修改本系统最后的高危 updateLastRisk(patients.getId()); + //修改本院最后一次定义高危 + updateLastRhTime(patients.getId(), hospitalId); } else { - String hospitalId = autoMatchFacade.getHospitalId(userId); AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setParentId(excAddRequest.getParentId()); antExChuQuery1.setYn(YnEnums.YES.getId()); @@ -209,9 +216,15 @@ public class AntenatalExaminationFacade { // updatePatientRiskLevel(antExChuModel, patients); patientsService.updatePatient(patients); updateLastRisk(patients.getId()); + + //修改本院最后一次定义高危 + updateLastRhTime(patients.getId(), hospitalId); + if (null != patients.getBuildType() && patients.getBuildType() == 3) { - patients.setEnable("1"); - patientsService.updatePatient(patients); + Patients patients1 = new Patients(); + patients1.setEnable("1"); + patients1.setId(patients.getId()); + patientsService.updatePatient(patients1); ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(patients.getId()); String hospital = autoMatchFacade.getHospitalId(userId); @@ -247,16 +260,74 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** + * 修改最后一次定义高危的时间 + * + * @param parentId + * @param hospitalId + */ + private void updateLastRhTime(String parentId, String hospitalId) { + + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setHospitalId(hospitalId); + antExQuery.setParentId(parentId); + + List antExList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified")); +// Patients patients = patientsService.findOnePatientById(parentId); + boolean hasLast = false; + Patients patients = new Patients(); + if (CollectionUtils.isNotEmpty(antExList)) { + for (AntenatalExaminationModel antEx : antExList) { + if (StringUtils.isNotEmpty(antEx.getRiskFactor()) && !"[]".equals(antEx.getRiskFactor())) { + patients.setLastRhTime(antEx.getCheckDate()); + hasLast = true; + break; + } else if (StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk())) { + patients.setLastRhTime(antEx.getCheckDate()); + hasLast = true; + break; + } + } + } + + //查询初诊 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(parentId); + antExChuQuery.setHospitalId(hospitalId); + + List antExChuList = antenatalExaminationService.queryAntExChu(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified")); + + if (CollectionUtils.isNotEmpty(antExChuList)) { + for (AntExChuModel antExChuModel : antExChuList) { + if (StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) { + patients.setLastRhTime(antExChuModel.getCheckTime()); + hasLast = true; + break; + } else if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk())) { + patients.setLastRhTime(antExChuModel.getCheckTime()); + hasLast = true; + break; + } + } + } + if (hasLast) { + patients.setId(parentId); + patientsService.updatePatient(patients); + } + } + //修改患者风险等级 private void updatePatientRiskLevel(AntExChuModel antExChuModel, Patients patients) { List list = new ArrayList<>(); - Integer score=0; + Integer score = 0; try { if (StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) { List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); for (int i = 0; i < l.size(); i++) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(l.get(i).toString()); - score+=basicConfig.getScore(); + score += basicConfig.getScore(); basicConfig = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); if (null != basicConfig && !list.contains(basicConfig.getId())) { list.add(basicConfig.getId()); @@ -276,7 +347,7 @@ public class AntenatalExaminationFacade { Object idObj = map.get("fxpf"); if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); - score +=NumberUtils.toInt(basicConfig.getName(), 0); + score += NumberUtils.toInt(basicConfig.getName(), 0); } } } catch (Exception e) { @@ -303,13 +374,13 @@ public class AntenatalExaminationFacade { //修改患者风险等级 private void updatePatientRiskLevel(AntenatalExaminationModel antExChuModel, Patients patients) { List list = new ArrayList<>(); - Integer score=0; + Integer score = 0; try { if (StringUtils.isNotEmpty(antExChuModel.getRiskFactor()) && !"[]".equals(antExChuModel.getRiskFactor())) { List l = JsonUtil.toList(antExChuModel.getRiskFactor(), List.class); for (int i = 0; i < l.size(); i++) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(l.get(i).toString()); - score+=basicConfig.getScore(); + score += basicConfig.getScore(); basicConfig = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); if (null != basicConfig && !list.contains(basicConfig.getId())) { list.add(basicConfig.getId()); @@ -329,7 +400,7 @@ public class AntenatalExaminationFacade { Object idObj = map.get("fxpf"); if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); - score +=NumberUtils.toInt(basicConfig.getName(),0); + score += NumberUtils.toInt(basicConfig.getName(), 0); } } } catch (Exception e) { @@ -636,7 +707,7 @@ public class AntenatalExaminationFacade { sortList(listDate); //需要过滤掉建档就分娩的情况 - Date dueDate =null; + Date dueDate = null; if (CollectionUtils.isNotEmpty(listDate)) { String pid = ""; int count = 0; @@ -659,7 +730,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(patientses)) { count = count + patientses.size(); //TODO 处理自动分娩的情况 - updateAutoMatdel(patientses,list,i,dueDate,sortList,listDate,map); + updateAutoMatdel(patientses, list, i, dueDate, sortList, listDate, map); listData = new ArrayList(); } @@ -686,13 +757,13 @@ public class AntenatalExaminationFacade { postReviewQuery.setPid(pid); Object obj = map.get(listDate.get(i).getId()); if (obj instanceof MaternalDeliverModel) { - MaternalDeliverModel model= (MaternalDeliverModel)obj; + MaternalDeliverModel model = (MaternalDeliverModel) obj; if (null != model.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); } listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); } else if (obj instanceof StopPregModel) { - StopPregModel model= (StopPregModel)obj; + StopPregModel model = (StopPregModel) obj; if (null != model.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); } @@ -703,7 +774,7 @@ public class AntenatalExaminationFacade { List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { - if(postReviewModel.getYn()==YnEnums.YES.getId()){ + if (postReviewModel.getYn() == YnEnums.YES.getId()) { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } @@ -742,7 +813,7 @@ public class AntenatalExaminationFacade { List l = buildPatientList(new Date(), patientsList, list1, min, false); if (!l.isEmpty()) { sort(l); - updateEditEnable(l,sortList); + updateEditEnable(l, sortList); sortList.add(l); } } @@ -760,9 +831,9 @@ public class AntenatalExaminationFacade { if (!tmp.isEmpty()) { min = tmp.get(tmp.size() - 1).getDate(); } - updateAutoMatdel(list,list,0,dueDate,sortList,null,null); - if(size!=list.size()){ - list1 = new ArrayList(); + updateAutoMatdel(list, list, 0, dueDate, sortList, null, null); + if (size != list.size()) { + list1 = new ArrayList(); } /*if(null==dueDate){ dueDate= new Date(); @@ -770,7 +841,7 @@ public class AntenatalExaminationFacade { List l = buildPatientList(dueDate, list, list1, min, true); if (!l.isEmpty()) { sort(l); - updateEditEnable(l,sortList); + updateEditEnable(l, sortList); sortList.add(l); } } @@ -782,17 +853,17 @@ public class AntenatalExaminationFacade { /** * 处理自动分娩的情况 */ - private void updateAutoMatdel(List patientses,List list,int i,Date dueDate,List sortList,List listDate, Map map ){ + private void updateAutoMatdel(List patientses, List list, int i, Date dueDate, List sortList, List listDate, Map map) { Iterator iterator = patientses.iterator(); - Organization organization=null; - String pid=""; - List listData=new ArrayList(); + Organization organization = null; + String pid = ""; + List listData = new ArrayList(); while (iterator.hasNext()) { Patients patients = iterator.next(); //处理建档就分娩的情况 Date date = DateUtil.addWeek(patients.getLastMenses(), 42); Date currentDate = DateUtil.formatDate(patients.getCreated()); - if (date.getTime() <= currentDate.getTime()||patients.getBuildType()==2) { + if (date.getTime() <= currentDate.getTime() || patients.getBuildType() == 2) { //建档记录 if (null != patients.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); @@ -801,14 +872,14 @@ public class AntenatalExaminationFacade { listData.add(new AntData(patients, null != organization ? organization.getName() : "")); - if(null==dueDate &&null!=patients.getFmDate()){ - dueDate=patients.getFmDate(); + if (null == dueDate && null != patients.getFmDate()) { + dueDate = patients.getFmDate(); } - if(null!=map){ + if (null != map) { Object obj = map.get(listDate.get(i).getId()); if (obj instanceof MaternalDeliverModel) { - MaternalDeliverModel model= (MaternalDeliverModel)obj; + MaternalDeliverModel model = (MaternalDeliverModel) obj; if (null != model.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); } @@ -821,8 +892,8 @@ public class AntenatalExaminationFacade { postReviewQuery.setStart(dueDate); if (CollectionUtils.isNotEmpty(listDate)) { //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 - if(listDate.size()>1 && i >1){ - postReviewQuery.setEnd(listDate.get(i-1).getDate()); + if (listDate.size() > 1 && i > 1) { + postReviewQuery.setEnd(listDate.get(i - 1).getDate()); } } } @@ -833,7 +904,7 @@ public class AntenatalExaminationFacade { List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { - if(postReviewModel.getYn()==YnEnums.YES.getId()) { + if (postReviewModel.getYn() == YnEnums.YES.getId()) { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } @@ -846,31 +917,29 @@ public class AntenatalExaminationFacade { iterator.remove(); updateEditEnable(listData, sortList); sortList.add(listData); - listData=new ArrayList(); + listData = new ArrayList(); } } } /** - * * 修改按钮控制 * - * - * @param list 同一产程记录 + * @param list 同一产程记录 * @param sortList 排序的结果 */ - private void updateEditEnable(List list,List> sortList){ + private void updateEditEnable(List list, List> sortList) { //如果上个产程有数据，并且本产程有记录就设置上个产程不可编辑 - if(CollectionUtils.isNotEmpty(sortList) &&CollectionUtils.isNotEmpty(list)){ - List l = sortList.get(0); - for(AntData antData:l){ + if (CollectionUtils.isNotEmpty(sortList) && CollectionUtils.isNotEmpty(list)) { + List l = sortList.get(0); + for (AntData antData : l) { antData.setEnableEdit("0"); } } //如果最后一条是复查 4 5 6 分娩 复查 终止妊娠 - if("456".indexOf(list.get(list.size()-1).getType())>-1){ - for(int i=0;i -1) { + for (int i = 0; i < list.size() - 1; i++) { list.get(i).setEnableEdit("0"); } } @@ -917,53 +986,53 @@ public class AntenatalExaminationFacade { } - //初诊记录 - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - if (!f) { - if (null == min) { - antExChuQuery.setStart(patientses.get(0).getBookbuildingDate()); - antExChuQuery.setEnd(new Date(end.getTime() + 86398000)); - } else { - antExChuQuery.setStart(min); - antExChuQuery.setEnd(end); - } + //初诊记录 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + if (!f) { + if (null == min) { + antExChuQuery.setStart(patientses.get(0).getBookbuildingDate()); + antExChuQuery.setEnd(new Date(end.getTime() + 86398000)); + } else { + antExChuQuery.setStart(min); + antExChuQuery.setEnd(end); } - antExChuQuery.setPid(pid); + } + antExChuQuery.setPid(pid); - List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(antExChuModels)) { - for (AntExChuModel an : antExChuModels) { - if (null != an.getHospitalId()) { - organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); - } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses())); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + for (AntExChuModel an : antExChuModels) { + if (null != an.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } + listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses())); } + } - //复诊记录 - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setPid(pid); - if (!f) { - if (null == min) { - antExQuery.setStart(patientses.get(0).getBookbuildingDate()); - antExQuery.setEnd(new Date(end.getTime() + 86398000)); - } else { - antExQuery.setStart(min); - antExQuery.setEnd(end); - } + //复诊记录 + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setPid(pid); + if (!f) { + if (null == min) { + antExQuery.setStart(patientses.get(0).getBookbuildingDate()); + antExQuery.setEnd(new Date(end.getTime() + 86398000)); + } else { + antExQuery.setStart(min); + antExQuery.setEnd(end); } + } - List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(list1)) { - for (AntenatalExaminationModel an : list1) { - if (null != an.getHospitalId()) { - organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); - } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses())); + List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(list1)) { + for (AntenatalExaminationModel an : list1) { + if (null != an.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } + listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses())); } + } return listData; } @@ -1193,9 +1262,9 @@ public class AntenatalExaminationFacade { } antExQuery.setId(null); list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if(CollectionUtils.isNotEmpty(list)){ - for(int i=0;i