diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java index 2116572..b9b25df 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java @@ -5,6 +5,9 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import org.springframework.data.mongodb.core.query.Criteria; + +import java.util.Date; /** * Created by Administrator on 2016/6/21 0021. @@ -13,6 +16,26 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { private String parentId; private Integer yn; private String id; + //创建时间 + private Date start; + + private Date end; + + public Date getEnd() { + return end; + } + + public void setEnd(Date end) { + this.end = end; + } + + public Date getStart() { + return start; + } + + public void setStart(Date start) { + this.start = start; + } public String getId() { return id; @@ -34,6 +57,24 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=id){ condition= condition.and("id",id, MongoOper.IS); } + boolean isAddStart = Boolean.FALSE; + Criteria c = null; + if (null != start) { + c = Criteria.where("created").gte(start); + isAddStart = Boolean.TRUE; + } + + if (null != end) { + if (isAddStart) { + c=c.lte(end); + } else { + c = Criteria.where("created").lte(end); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } return condition.toMongoQuery(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index d981425..50454fb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -5,6 +5,9 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import org.springframework.data.mongodb.core.query.Criteria; + +import java.util.Date; /** * 产前检查查询 @@ -15,6 +18,27 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { private String parentId; private Integer yn; private String id; + //创建时间 + private Date start; + + private Date end; + + public Date getEnd() { + return end; + } + + public void setEnd(Date end) { + this.end = end; + } + + public Date getStart() { + return start; + } + + public void setStart(Date start) { + this.start = start; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition=MongoCondition.newInstance(); @@ -27,6 +51,26 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=id){ condition= condition.and("id",id, MongoOper.IS); } + + + boolean isAddStart = Boolean.FALSE; + Criteria c = null; + if (null != start) { + c = Criteria.where("created").gte(start); + isAddStart = Boolean.TRUE; + } + + if (null != end) { + if (isAddStart) { + c=c.lte(end); + } else { + c = Criteria.where("created").lte(end); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } return condition.toMongoQuery(); } 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 a365cef..f2d057d 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 @@ -50,6 +50,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer serviceStatus; //体验会员 0非会员 1会员 private Integer expVip; + //创建时间 + private Date created; + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } /** * 产妇手机号 @@ -363,7 +373,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != communityId && !"-1".equals(communityId)) { condition = condition.and("communityId", communityId, MongoOper.IS); } - + if(null!=created){ + condition = condition.and("created", created, MongoOper.LTE); + } if (null != hScore) { condition = condition.and("riskScore", hScore, MongoOper.IS); }else if(null!=isHighRisk){ diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java index 6026d94..2b2611e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java @@ -5,6 +5,9 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import org.springframework.data.mongodb.core.query.Criteria; + +import java.util.Date; /** * Created by Administrator on 2016/6/28 0028. @@ -13,6 +16,26 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery private String id; private String parentId; private Integer yn; + //创建时间 + private Date start; + + private Date end; + + public Date getEnd() { + return end; + } + + public void setEnd(Date end) { + this.end = end; + } + + public Date getStart() { + return start; + } + + public void setStart(Date start) { + this.start = start; + } public String getId() { return id; @@ -50,6 +73,25 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery if(null!=parentId){ mongoCondition= mongoCondition.and("parentId",parentId, MongoOper.IS); } + + boolean isAddStart = Boolean.FALSE; + Criteria c = null; + if (null != start) { + c = Criteria.where("created").gte(start); + isAddStart = Boolean.TRUE; + } + + if (null != end) { + if (isAddStart) { + c=c.lte(end); + } else { + c = Criteria.where("created").lte(end); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(mongoCondition.getCriteria())).toMongoQuery(); + } return mongoCondition.toMongoQuery(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index bec6a4d..39e889d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -4,14 +4,14 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; -import com.lyms.platform.operate.web.request.AntExAddRequest; -import com.lyms.platform.operate.web.request.AntExQueryRequest; -import com.lyms.platform.operate.web.request.AntExcAddRequest; -import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; +import com.lyms.platform.operate.web.request.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; @@ -35,7 +35,7 @@ public class AntenatalExaminationController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/antexmanage") @ResponseBody public BaseResponse queryAntenatalExamination(@Valid AntenatalExaminationQueryRequest antenatalExaminationQueryRequest) { - if(StringUtils.isEmpty(antenatalExaminationQueryRequest.getCardNo())&&StringUtils.isEmpty(antenatalExaminationQueryRequest.getVcCardNo())){ + if (StringUtils.isEmpty(antenatalExaminationQueryRequest.getCardNo()) && StringUtils.isEmpty(antenatalExaminationQueryRequest.getVcCardNo())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输出参数."); } return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest); @@ -52,6 +52,7 @@ public class AntenatalExaminationController extends BaseController { public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest) { return antenatalExaminationFacade.addOneAntEx(antExAddRequest); } + /** * 增加产前检查(初诊) * @@ -60,7 +61,7 @@ public class AntenatalExaminationController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/antex") @ResponseBody - public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest){ + public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest) { return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest); } @@ -88,9 +89,21 @@ public class AntenatalExaminationController extends BaseController { public BaseResponse delOneAntById(@Valid AntExQueryRequest antExQueryRequest) { return antenatalExaminationFacade.delOneAntEx(antExQueryRequest); } + @RequestMapping(method = RequestMethod.GET, value = "/antex/getenums") @ResponseBody - public BaseResponse getEnums(){ + public BaseResponse getEnums() { return antenatalExaminationFacade.getEnums(); } -} + + /** + * 获取产妇整个产程的建档记录 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/antex/antexlist") + @ResponseBody + public BaseResponse findAntExList(@Valid AntExListQueryRequest exListQueryRequest) { + return antenatalExaminationFacade.findAntExList(exListQueryRequest); + } +} \ No newline at end of file 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 9a17357..eb070d6 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 @@ -1,39 +1,30 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.AntenatalExaminationService; -import com.lyms.platform.biz.service.ApplyOrderService; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; 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.common.utils.SystemConfig; -import com.lyms.platform.operate.web.request.AntExAddRequest; -import com.lyms.platform.operate.web.request.AntExQueryRequest; -import com.lyms.platform.operate.web.request.AntExcAddRequest; -import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; +import com.lyms.platform.operate.web.request.*; +import com.lyms.platform.operate.web.result.AntData; import com.lyms.platform.operate.web.result.AntenatalExaminationResult; import com.lyms.platform.operate.web.result.AntexChuResult; import com.lyms.platform.operate.web.result.AntexListResult; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.AntExChuQuery; -import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.ReferralApplyOrderQuery; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; 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.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 产前检查接口 @@ -54,6 +45,10 @@ public class AntenatalExaminationFacade { private ApplyOrderService applyOrderService; @Autowired private OrganizationService organizationService; + @Autowired + private MatDeliverService matDeliverService; + @Autowired + private PostReviewService postReviewService; /** * 增加一条产前检查 @@ -65,7 +60,7 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(antExAddRequest.getId())) { AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel(); antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId()); - updateApplyOrder(antenatalExamination,antExAddRequest.getParentId()); + updateApplyOrder(antenatalExamination, antExAddRequest.getParentId()); } else { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); model.setYn(YnEnums.YES.getId()); @@ -77,7 +72,7 @@ public class AntenatalExaminationFacade { } - public void updateApplyOrder(AntenatalExaminationModel antenatalExamination ,String parentId){ + public void updateApplyOrder(AntenatalExaminationModel antenatalExamination, String parentId) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(parentId); @@ -91,6 +86,7 @@ public class AntenatalExaminationFacade { referralApplyOrderModel.setrLevel("黄"); applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel); } + /** * 增加或修改产前检查记录(初诊) * @@ -108,6 +104,88 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** + * 查询产妇所有产检的数据 + * + * @param exListQueryRequest + * @return + */ + public BaseResponse findAntExList(AntExListQueryRequest exListQueryRequest) { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setCardNo(exListQueryRequest.getCardNo()); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setPhone(exListQueryRequest.getPhone()); + //获取所有的建档记录 + List list = patientsService.queryPatient(patientsQuery); + List listDate = new ArrayList(); + int i = 0; + if (CollectionUtils.isNotEmpty(list)) { + for (Patients patients : list) { + List data = new ArrayList<>(); + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setParentId(patients.getId()); + //建档记录 + data.add(new AntData(patients)); + //分娩记录 + List modelList = matDeliverService.query(matDeliverQuery); + String dueDate = ""; + if (CollectionUtils.isNotEmpty(modelList)) { + MaternalDeliverModel model = modelList.get(0); + dueDate = model.getDueDate(); + } + PostReviewQuery postReviewQuery = null; + if (StringUtils.isNotEmpty(dueDate)) { + Date date = DateUtil.parseYMD(dueDate); + //初诊记录 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setStart(patients.getCreated()); + antExChuQuery.setEnd(new Date(date.getTime() + 86398000)); + antExChuQuery.setParentId(patients.getId()); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + for (AntExChuModel an : antExChuModels) { + data.add(new AntData(an)); + } + } + //复诊记录 + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setParentId(patients.getId()); + antExQuery.setStart(patients.getCreated()); + antExQuery.setEnd(new Date(date.getTime() + 86398000)); + List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(list1)) { + for (AntenatalExaminationModel an : list1) { + data.add(new AntData(an)); + } + } + postReviewQuery = new PostReviewQuery(); + postReviewQuery.setYn(YnEnums.YES.getId()); + postReviewQuery.setStart(date); + //下次建档记录前都是产后复查 + postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() : new Date()); + postReviewQuery.setParentId(patients.getId()); + } + i++; + //分娩记录 + if (CollectionUtils.isNotEmpty(modelList)) { + data.add(new AntData(modelList.get(0),patients.getLastMenses())); + } + //产后复查记录 + List reviewModels=postReviewService.findWithList(postReviewQuery); + if(CollectionUtils.isNotEmpty(reviewModels)){ + for(PostReviewModel postReviewModel:reviewModels){ + data.add(new AntData(postReviewModel)); + } + } + listDate.add(data); + } + } + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(listDate); + } /** * 删除一条产前检查 @@ -138,12 +216,14 @@ public class AntenatalExaminationFacade { * @param vcCardNo * @return */ - public Patients findOnePatient(String cardNo, String vcCardNo) { + public Patients findOnePatient(String cardNo, String vcCardNo, String id) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); } else if (StringUtils.isNotEmpty(vcCardNo)) { patientsQuery.setVcCardNo(vcCardNo); + } else if (StringUtils.isNotEmpty(id)) { + patientsQuery.setId(id); } patientsQuery.setYn(YnEnums.YES.getId()); @@ -176,7 +256,7 @@ public class AntenatalExaminationFacade { } } else { //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo()); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null); } if (null == patients) { @@ -270,22 +350,24 @@ public class AntenatalExaminationFacade { map.put("ydqjd", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.YDQJD)); map.put("fxys", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.FXYS)); map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.GWFZ)); - map.put("organizations",convert()); + map.put("organizations", convert()); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public List convert(){ + + public List convert() { List organization = organizationService.queryHospital(); List data = new ArrayList(); - if(CollectionUtils.isNotEmpty(organization)){ - for(Organization org:organization){ + if (CollectionUtils.isNotEmpty(organization)) { + for (Organization org : organization) { Map map = new HashMap(); - map.put("id",org.getId()); - map.put("name",org.getName()); + map.put("id", org.getId()); + map.put("name", org.getName()); data.add(map); } } return data; } + public List getFuZhong() { List list = new ArrayList<>(); for (FuZhongEnums enums : FuZhongEnums.values()) { 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 042ba65..70a2ea8 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,7 +134,7 @@ public class MatDeliverFacade { */ public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest) { //获取 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo()); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(),null); if (null == patients) { return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExListQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExListQueryRequest.java new file mode 100644 index 0000000..56fce23 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExListQueryRequest.java @@ -0,0 +1,45 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; + +/** + * + * 孕妇建档列表 + * + * Created by Administrator on 2016/7/5 0005. + */ + +@Form +public class AntExListQueryRequest { + + private String parentId; + @FormParam + private String cardNo; + @FormParam + private String phone; + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java new file mode 100644 index 0000000..56398e4 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java @@ -0,0 +1,104 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.*; + +import java.util.Date; + +public class AntData { + private String dueWeek; + private String id; + private String checkTime; + private String title; + //1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查 + private String type; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public AntData(AntenatalExaminationModel model) { + this.id = model.getId(); + this.dueWeek = model.getCurrentDueDate(); + this.checkTime = model.getCheckDate(); + this.title="产前复诊"; + this.type="3"; + } + + public AntData(AntExChuModel model) { + this.id = model.getId(); + int days = DateUtil.daysBetween(model.getLastMenses(), new Date()); + String week = (days / 7) + ""; + int day = (days % 7); + this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + this.checkTime = model.getCheckTime(); + this.title="产前初诊"; + this.type="2"; + } + + public AntData(Patients model) { + this.id = model.getId(); + int days = DateUtil.daysBetween(model.getLastMenses(), new Date()); + String week = (days / 7) + ""; + int day = (days % 7); + this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated()); + this.title="孕妇建档"; + this.type="1"; + } + + public AntData(MaternalDeliverModel model,Date lastMenses) { + this.id = model.getId(); + int days = DateUtil.daysBetween(lastMenses,model.getCreated()); + String week = (days / 7) + ""; + int day = (days % 7); + this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated()); + this.title="孕妇分娩"; + this.type="4"; + } + + public AntData(PostReviewModel postReviewModel) { + this.id=postReviewModel.getId(); + this.dueWeek=postReviewModel.getDay(); + this.checkTime=postReviewModel.getCheckTime(); + this.title="产后复查"; + this.type="5"; + } + + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +} \ No newline at end of file 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 25b27ea..44c5231 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 @@ -148,48 +148,7 @@ public class AntexListResult { setData(dataList); return this; } - private class AntData{ - private String dueWeek; - private String id; - private String checkTime; - public AntData(AntenatalExaminationModel model){ - this.id=model.getId(); - this.dueWeek=model.getCurrentDueDate(); - this.checkTime=model.getCheckDate(); - } - - public AntData(AntExChuModel model){ - this.id=model.getId(); - int days= DateUtil.daysBetween(model.getLastMenses(),new Date()); - String week= (days/7)+""; - int day = (days%7); - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); - this.checkTime=model.getCheckTime(); - } - public String getCheckTime() { - return checkTime; - } - - public void setCheckTime(String checkTime) { - this.checkTime = checkTime; - } - - public String getDueWeek() { - return dueWeek; - } - - public void setDueWeek(String dueWeek) { - this.dueWeek = dueWeek; - } - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - } public List getData() { return data; }