From f9ea3fb9f4d0d2be49f10b14e5f13c37bcf40d40 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 5 Sep 2016 16:51:25 +0800 Subject: [PATCH] 1 --- .../platform/biz/dal/IReferralApplyOrderDao.java | 7 +++ .../biz/dal/impl/ReferralApplyOrderDaoImpl.java | 5 ++ .../lyms/platform/biz/service/PatientsService.java | 44 ++++++++++++-- .../platform/pojo/ReferralApplyOrderModel.java | 18 ++++-- .../platform/query/ReferralApplyOrderQuery.java | 12 ++-- .../web/facade/AntenatalExaminationFacade.java | 1 + .../operate/web/facade/ApplyOrderFacade.java | 23 ++++--- .../operate/web/result/ApplyOrderOutResult.java | 70 ++++++++++------------ 8 files changed, 118 insertions(+), 62 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java index fced272..ee80423 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java @@ -31,4 +31,11 @@ public interface IReferralApplyOrderDao { Integer count(MongoQuery mongoQuery); void findAndModify(MongoQuery referralApplyOrderQuery,ReferralApplyOrderModel applyOrderModel); + + /** + * 修改转诊记录 + * + * @param referralApplyOrderModel + */ + void updateOne(ReferralApplyOrderModel referralApplyOrderModel); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java index 300cf4e..8d4c70c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java @@ -2,6 +2,8 @@ package com.lyms.platform.biz.dal.impl; import com.lyms.platform.biz.dal.IReferralApplyOrderDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; +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 com.lyms.platform.pojo.ReferralApplyOrderModel; import org.springframework.stereotype.Repository; @@ -35,4 +37,7 @@ public class ReferralApplyOrderDaoImpl extends BaseMongoDAOImpl referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); + if(CollectionUtils.isNotEmpty(referralApplyOrderModel)){ + for(ReferralApplyOrderModel referralApplyOrderModel1:referralApplyOrderModel){ + referralApplyOrderModel1.setBirth(patients.getBirth()); + referralApplyOrderModel1.setLastMenses(patients.getLastMenses()); + referralApplyOrderModel1.setName(patients.getUsername()); + referralApplyOrderModel1.setCardNo(patients.getCardNo()); + referralApplyOrderModel1.setPhone(patients.getPhone()); + iReferralApplyOrderDao.updateOne(referralApplyOrderModel1); + } + } + } + public SieveModel convertToModel(Patients patients) { SieveModel sieveModel = new SieveModel(); sieveModel.setParentId(patients.getId()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index f2f7bdc..1225208 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -28,11 +28,13 @@ public class ReferralApplyOrderModel { private String phone; //生日 private Date birth; - //申请孕周、申请月龄(多少天) - private Integer dueWeek; + //申请时间(多少天) + private Date dueWeek; //末次月经 private Date lastMenses; private String otherHighRisk; + //孕妇状态 1 已分勉 2 未分娩 + private Integer pStatus; //身份证号 private String cardNo; //母亲身份证号 @@ -80,6 +82,14 @@ public class ReferralApplyOrderModel { private Integer serviceType; + public Integer getpStatus() { + return pStatus; + } + + public void setpStatus(Integer pStatus) { + this.pStatus = pStatus; + } + public String getOtherHighRisk() { return otherHighRisk; } @@ -144,11 +154,11 @@ public class ReferralApplyOrderModel { this.expVip = expVip; } - public Integer getDueWeek() { + public Date getDueWeek() { return dueWeek; } - public void setDueWeek(Integer dueWeek) { + public void setDueWeek(Date dueWeek) { this.dueWeek = dueWeek; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index 1aaede3..bc2904b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -41,9 +41,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati //年龄 private String age; //孕周 - private Integer dueDateStart; + private Date dueDateStart; //孕周 - private Integer dueDateEnd; + private Date dueDateEnd; //风险等级 private String rLevel; private Integer scoreStart; @@ -271,19 +271,19 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati this.id = id; } - public Integer getDueDateEnd() { + public Date getDueDateEnd() { return dueDateEnd; } - public void setDueDateEnd(Integer dueDateEnd) { + public void setDueDateEnd(Date dueDateEnd) { this.dueDateEnd = dueDateEnd; } - public Integer getDueDateStart() { + public Date getDueDateStart() { return dueDateStart; } - public void setDueDateStart(Integer dueDateStart) { + public void setDueDateStart(Date dueDateStart) { this.dueDateStart = dueDateStart; } 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 59d67a3..d406663 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 @@ -639,6 +639,7 @@ public class AntenatalExaminationFacade { postReviewQuery.setEnd(patientses.get(0).getBookbuildingDate()); } } + postReviewQuery.setYn(YnEnums.YES.getId()); postReviewQuery.setPid(pid); //产后复查记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index e7e59b2..8167680 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -130,7 +130,11 @@ public class ApplyOrderFacade { referralApplyOrderModel.setrLevel(lsit); // referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); referralApplyOrderModel.setPid(patients.getPid()); - referralApplyOrderModel.setDueWeek(days); + referralApplyOrderModel.setDueWeek(new Date()); + referralApplyOrderModel.setpStatus(2); + if(null!=patients.getFmDate()){ + referralApplyOrderModel.setpStatus(1); + } referralApplyOrderModel.setServiceType(patients.getServiceType()); id = patients.getId(); if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { @@ -175,8 +179,9 @@ public class ApplyOrderFacade { id = babyModel.getId(); if (null != babyModel.getBirth()) { referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); - referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date())); +// referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date())); } + referralApplyOrderModel.setDueWeek(new Date()); Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); referralApplyOrderModel.setParentId(babyModel.getId()); referralApplyOrderModel.setMname(patients.getUsername()); @@ -463,9 +468,8 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); } } - + Date currentDate = DateUtil.formatDate(new Date()); if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) { - Date currentDate = DateUtil.formatDate(new Date()); /* Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1);*/ Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()) - 1); @@ -473,7 +477,6 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setBirthEnd(date); } if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { - Date currentDate = DateUtil.formatDate(new Date()); referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd()))); } @@ -549,13 +552,15 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setBirthEnd(date); } //根据孕周 + Date currentDate = DateUtil.formatDate(new Date()); if (null != applyOrderQueryRequest.getEndDueWeek() && NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())) { - int i = NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek()) * 7 + 6; - referralApplyOrderQuery.setDueDateEnd(i); + Date end= DateUtil.addDay(DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())), 6); + referralApplyOrderQuery.setDueDateEnd(end); } if (null != applyOrderQueryRequest.getStartDueWeek()) { - int i = NumberUtils.toInt(applyOrderQueryRequest.getStartDueWeek()) * 7; - referralApplyOrderQuery.setDueDateStart(i); + Date end= DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())); +// int i = NumberUtils.toInt(applyOrderQueryRequest.getStartDueWeek()) * 7; + referralApplyOrderQuery.setDueDateStart(end); } if (null != applyOrderQueryRequest.getStartScore()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 50b99c5..8423458 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -1,13 +1,10 @@ package com.lyms.platform.operate.web.result; -import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.enums.ApplyOrderStatusEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.ReferralApplyOrderModel; -import org.apache.commons.collections.CollectionUtils; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -17,7 +14,7 @@ import java.util.Map; * Created by Administrator on 2016/6/27 0027. */ public class ApplyOrderOutResult { - public static final String SPIT="-"; + public static final String SPIT = "-"; private String id; private String pid; @@ -37,7 +34,7 @@ public class ApplyOrderOutResult { //风险因素 private String rRisk; - private Integer score=0; + private Integer score = 0; //病情描述 private String diseaseDesc; //转院必要性 @@ -48,7 +45,7 @@ public class ApplyOrderOutResult { private String transferMode; //申请医生 private String applyDoctor; - //接收日期 + //接收日期 private String received; //接收医生 private String recDoctor; @@ -77,7 +74,7 @@ public class ApplyOrderOutResult { } public String getcDueWeek() { - if(null==cDueWeek){ + if (null == cDueWeek) { return SPIT; } return cDueWeek; @@ -121,7 +118,7 @@ public class ApplyOrderOutResult { public String getCardNo() { - if(null==cardNo){ + if (null == cardNo) { return SPIT; } return cardNo; @@ -129,7 +126,7 @@ public class ApplyOrderOutResult { public String getRecDoctor() { - if(null==recDoctor){ + if (null == recDoctor) { return SPIT; } return recDoctor; @@ -144,7 +141,7 @@ public class ApplyOrderOutResult { } public String getAge() { - if(StringUtils.isEmpty(cardNo)){ + if (StringUtils.isEmpty(cardNo)) { return SPIT; } @@ -157,7 +154,7 @@ public class ApplyOrderOutResult { public String getTransferredHospital() { - if(null==transferredHospital){ + if (null == transferredHospital) { return SPIT; } return transferredHospital; @@ -168,7 +165,7 @@ public class ApplyOrderOutResult { } public String getStatus() { - if(null==status){ + if (null == status) { return SPIT; } return status; @@ -179,7 +176,7 @@ public class ApplyOrderOutResult { } public String getApplyDoctor() { - if(null==applyDoctor){ + if (null == applyDoctor) { return SPIT; } return applyDoctor; @@ -198,7 +195,7 @@ public class ApplyOrderOutResult { } public String getDiseaseDesc() { - if(null==diseaseDesc){ + if (null == diseaseDesc) { return SPIT; } return diseaseDesc; @@ -209,7 +206,7 @@ public class ApplyOrderOutResult { } public String getDueDate() { - if(null==dueDate){ + if (null == dueDate) { return SPIT; } return dueDate; @@ -220,7 +217,7 @@ public class ApplyOrderOutResult { } public String getDueWeek() { - if(null==dueWeek){ + if (null == dueWeek) { return SPIT; } return dueWeek; @@ -248,7 +245,7 @@ public class ApplyOrderOutResult { public String getPotentialRisk() { - if(null==potentialRisk){ + if (null == potentialRisk) { return SPIT; } return potentialRisk; @@ -259,7 +256,7 @@ public class ApplyOrderOutResult { } public String getReceived() { - if(null==received){ + if (null == received) { return SPIT; } return received; @@ -278,7 +275,7 @@ public class ApplyOrderOutResult { } public String getrRisk() { - if(StringUtils.isEmpty(rRisk)){ + if (StringUtils.isEmpty(rRisk)) { return SPIT; } return rRisk; @@ -289,7 +286,7 @@ public class ApplyOrderOutResult { } public Integer getScore() { - if(null==score){ + if (null == score) { return 0; } return score; @@ -301,7 +298,7 @@ public class ApplyOrderOutResult { public String getTransferMode() { - if(null==transferMode){ + if (null == transferMode) { return SPIT; } return transferMode; @@ -312,7 +309,7 @@ public class ApplyOrderOutResult { } public String getTransferredDisease() { - if(null==transferredDisease){ + if (null == transferredDisease) { return SPIT; } return transferredDisease; @@ -322,33 +319,28 @@ public class ApplyOrderOutResult { this.transferredDisease = transferredDisease; } - public ApplyOrderOutResult convertToResult(ReferralApplyOrderModel destModel,String zhuanCName,String zhuanRname) { + public ApplyOrderOutResult convertToResult(ReferralApplyOrderModel destModel, String zhuanCName, String zhuanRname) { setZhuanCName(zhuanCName); setZhuanRname(zhuanRname); setId(destModel.getId()); setName(destModel.getName()); setScore(destModel.getScore()); - if(null!=destModel.getDueWeek()){ - if(-1==destModel.getDueWeek()){ + if (null != destModel.getDueWeek()) { + if (1 == destModel.getpStatus()) { setDueWeek("已分娩"); setIsGravida("0"); - }else{ - setDueWeek(StringUtils.dueWeek(destModel.getDueWeek())); + } else { + setDueWeek(StringUtils.dueWeek(DateUtil.daysBetween(destModel.getLastMenses(), destModel.getDueWeek()))); setIsGravida("1"); } } setPid(destModel.getPid()); - if(null!=destModel.getLastMenses()) { - if (-1 == destModel.getDueWeek()){ - setcDueWeek("已分娩"); - setIsGravida("0"); - }else{ - setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(destModel.getLastMenses(), new Date()))); - setIsGravida("1"); - } + if (null != destModel.getLastMenses()) { + setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(destModel.getLastMenses(), new Date()))); + setIsGravida("1"); } - if(null!=destModel.getReceived()){ + if (null != destModel.getReceived()) { setReceived(DateUtil.getyyyy_MM_dd(destModel.getReceived())); } setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); @@ -359,10 +351,10 @@ public class ApplyOrderOutResult { setPotentialRisk(destModel.getPotentialRisk()); setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus())); setTransferredHospital(destModel.getTransferredHospital()); - if(null!=destModel.getBirth()){ + if (null != destModel.getBirth()) { Integer age = DateUtil.getAge(destModel.getBirth()); - if(null!=age){ - setAge(age+""); + if (null != age) { + setAge(age + ""); } } setCardNo(destModel.getCardNo()); -- 1.8.3.1