From 33b0c027c60ab17be5e9859153d18d897c0fe119 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 14 Nov 2016 11:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 4 +-- .../lyms/platform/biz/service/SieveService.java | 11 ++++++- .../platform/common/enums/SieveStatusEnums.java | 34 +++++++++++++++------- .../java/com/lyms/platform/pojo/SieveModel.java | 18 ++++++++++++ .../operate/web/facade/BookbuildingFacade.java | 12 +++++--- .../platform/operate/web/facade/SieveFacade.java | 9 +++++- .../operate/web/request/CqSieveQueryRequest.java | 23 +++++++++++++++ .../operate/web/result/SieveListResult.java | 14 +++++++++ 8 files changed, 106 insertions(+), 19 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 865f14c..3db01b9 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -106,7 +106,7 @@ public class PatientsService { */ public void addSieveJob() { //查询出满足15+3 20+6的孕妇 - Date endDate = DateUtil.addDay(new Date(), -108); + Date endDate = DateUtil.addDay(new Date(), -105); Date start = DateUtil.addDay(new Date(), -146); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setLastMensesEnd(endDate); @@ -234,7 +234,7 @@ public class PatientsService { if (null != patients && null != patients.getLastMenses()) { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); //判断是否在区间 - if (days >= 108 && days <= 146) { + if (days >= 105 && days <= 146) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(patients.getId()); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index 28a2edc..8e71e43 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -58,8 +58,9 @@ public class SieveService { iSieveDao.addChanQianSieve(sieveModel); } public void update(MongoQuery mongoQuery, SieveResultModel sieveResultModel) { - iSieveDao.update(mongoQuery,sieveResultModel); + iSieveDao.update(mongoQuery, sieveResultModel); } + public List queryList(SieveQuery sieveQuery) { MongoQuery mongoQuery = sieveQuery.convertToQuery(); if (StringUtils.isNotEmpty(sieveQuery.getNeed())) { @@ -69,6 +70,14 @@ public class SieveService { return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.DESC, "modified")); } + public List queryList1(SieveQuery sieveQuery,String filed) { + MongoQuery mongoQuery = sieveQuery.convertToQuery(); + if (StringUtils.isNotEmpty(sieveQuery.getNeed())) { + sieveQuery.mysqlBuild((int)iSieveDao.count(sieveQuery.convertToQuery())); + mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit()); + } + return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, filed)); + } /** * 根据id删除数据 * diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java index 9e1b89a..7ebb22a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java @@ -1,22 +1,22 @@ package com.lyms.platform.common.enums; /** - * * 产筛状态 - * + *

* Created by Administrator on 2016/7/6 0006. */ public enum SieveStatusEnums { -// 1 待产筛 2 产筛中 3 完成产筛 4 完成产诊 - O("待产筛",1), - O1("产筛中",2), - O2("完成产筛",3), - O3("完成产诊",4), - ; - private SieveStatusEnums(String name,Integer id){ - this.name=name; - this.id=id; + // 1 待产筛 2 产筛中 3 完成产筛 4 完成产诊 + O("待产筛", 1), + O1("产筛中", 2), + O2("已产筛", 3), + O3("已诊断", 4),; + + private SieveStatusEnums(String name, Integer id) { + this.name = name; + this.id = id; } + private String name; private Integer id; @@ -24,6 +24,18 @@ public enum SieveStatusEnums { return id; } + public static String getStrById(Integer id) { + if (null == id) { + return null; + } + for (SieveStatusEnums statusEnums : values()) { + if (id == statusEnums.getId()) { + return statusEnums.getName(); + } + } + return null; + } + public void setId(Integer id) { this.id = id; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index d34b985..7e0c5fa 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -51,11 +51,29 @@ public class SieveModel extends BaseModel { private String from; //申请产筛时间 private Date applyDate; + private String csRemarkTypeId; + private String detail; private Date created; private Date modified; private Integer yn; + public String getCsRemarkTypeId() { + return csRemarkTypeId; + } + + public void setCsRemarkTypeId(String csRemarkTypeId) { + this.csRemarkTypeId = csRemarkTypeId; + } + + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + public Date getApplyDate() { return applyDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 41a873f..f4b00bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -10,9 +10,7 @@ import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; -import com.lyms.platform.operate.web.request.MessageListRequest; -import com.lyms.platform.operate.web.request.MessageRequest; +import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.JdbcUtil; import com.lyms.platform.operate.web.utils.MessageCenterService; @@ -32,7 +30,6 @@ import org.springframework.stereotype.Component; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; @@ -1381,6 +1378,13 @@ public class BookbuildingFacade { } } + public BaseListResponse queryBookBuild(BookBuildManagerQueryRequest bookBuildManagerQueryRequest){ + PatientsQuery patientsQuery1=new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + yunBookbuildingService.queryPregnantWithQuery(patientsQuery1); + return new BaseListResponse(); + } + public BaseResponse findPatientById(String parentId,Integer userId){ PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(parentId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 5e72960..9179834 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -188,6 +188,13 @@ public class SieveFacade { if (null != cqSieveQueryRequest.getDueWeekEnd()) { sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6); } + if(null!=cqSieveQueryRequest.getcDueWeekStart()){ + sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart()*7))); + } + if(null!=cqSieveQueryRequest.getcDueWeekEnd()){ + sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd()*7)-6)); + } + sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); sieveQuery.setPage(cqSieveQueryRequest.getPage()); @@ -196,7 +203,7 @@ public class SieveFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); sieveQuery.setHospitalId(hospitalId); //查询产筛list - List list = sieveService.queryList(sieveQuery); + List list = sieveService.queryList1(sieveQuery,"status"); List data = new ArrayList<>(); if (CollectionUtils.isNotEmpty(list)) { for (SieveModel sieveModel : list) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java index c6a1b40..5e1766b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -40,6 +40,29 @@ public class CqSieveQueryRequest extends BasePageQueryRequest{ @FormParam private Integer status; + //当前孕周开始 + @FormParam + private Integer cDueWeekStart; + //当前孕周结束 + @FormParam + private Integer cDueWeekEnd; + + public Integer getcDueWeekStart() { + return cDueWeekStart; + } + + public void setcDueWeekStart(Integer cDueWeekStart) { + this.cDueWeekStart = cDueWeekStart; + } + + public Integer getcDueWeekEnd() { + return cDueWeekEnd; + } + + public void setcDueWeekEnd(Integer cDueWeekEnd) { + this.cDueWeekEnd = cDueWeekEnd; + } + public Integer getStatus() { return status; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index 2efea83..0fbfae1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -78,6 +78,19 @@ public class SieveListResult implements IBasicResultConvert