diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java index 6b8fe45..8bfcf96 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java @@ -20,6 +20,13 @@ public interface ISieveDao { SieveResultModel addSieveResult(SieveResultModel sieveResultModel); /** + * 根据id删除数据 + * + * @param mongoQuery + */ + void deleteById(MongoQuery mongoQuery); + + /** * 根据id查询产筛结果 * * @param id diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java index f165048..969619c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java @@ -28,6 +28,15 @@ public class SieveDaoImpl extends BaseMongoDAOImpl implements } /** + * 根据id删除数据 + * + * @param mongoQuery + */ + public void deleteById(MongoQuery mongoQuery) { + super.delete(mongoQuery.convertToMongoQuery()); + } + + /** * 根据id查询产筛结果 * * @param id @@ -64,13 +73,14 @@ public class SieveDaoImpl extends BaseMongoDAOImpl implements Assert.notNull(sieveQuery, "execute find method query must not null."); return mongoTemplate.find(sieveQuery.convertToMongoQuery(), SieveModel.class); } + /** * 查询产筛列表 * * @param sieveQuery * @return */ - public List queryListSieveResult(MongoQuery sieveQuery){ + public List queryListSieveResult(MongoQuery sieveQuery) { return find(sieveQuery.convertToMongoQuery()); } } \ No newline at end of file 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 ea29220..15ba581 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 @@ -190,13 +190,14 @@ public class PatientsService { } } /** - * 孕妇建档时调用的方法 + * 孕妇建档时调用的方法或者修改末次月经后调用 * * @param patients */ public void validata(Patients patients) { if (null != patients && null != patients.getLastMenses()) { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + //判断是否在区间 if (days >= 108 && days <= 146) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); @@ -206,7 +207,22 @@ public class PatientsService { SieveModel sieveModel = convertToModel(patients); sieveModel.setFrom("1"); sieveDao.addChanQianSieve(sieveModel); + }else{ + //修改孕妇基本信息 + for(SieveModel sieveModel:list){ + sieveModel.setPhone(patients.getPhone()); + sieveModel.setName(patients.getUsername()); + sieveModel.setLastMenses(patients.getLastMenses()); + sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); + sieveDao.updateChanQianSieve(sieveModel); + } } + }else{ + //修改孕妇末次月经不满足条件删除产筛数据 + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(patients.getId()); + sieveDao.deleteById(sieveQuery.convertToQuery()); } } } @@ -215,11 +231,7 @@ public class PatientsService { SieveModel sieveModel = new SieveModel(); sieveModel.setParentId(patients.getId()); sieveModel.setLastMenses(patients.getLastMenses()); - /* int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - String week = (days / 7) + ""; - int day = (days % 7); - String dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");*/ -// sieveModel.setDueWeek(dueWeek); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setNeed("1"); 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 428adbc..c08ae56 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 @@ -44,6 +44,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati private String rLevel; private Integer score; private String riskFactor; + private String hospitalName; //转入医院 private String transferredHospital; private String outHospitalId; @@ -52,6 +53,13 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati //体验会员 0非会员 1会员 private Integer expVip; + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } public Integer getExpVip() { return expVip; @@ -154,15 +162,11 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=expVip){ condition=condition.and("expVip",expVip, MongoOper.IS); } - if(null!=transferredHospital){ - condition=condition.and("transferredHospital",transferredHospital, MongoOper.IS); - } + if(null!=phone){ condition=condition.and("phone",phone, MongoOper.IS); } - if(null!=outHospitalId){ - condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS); - } + //需要修改 if(null!=dueDateEnd){ condition=condition.and("dueWeek",dueDateEnd, MongoOper.IS); @@ -182,6 +186,18 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=type){ condition=condition.and("type",type, MongoOper.IS); } + + if(null!=transferredHospital){ + if(null!=hospitalName){ + MongoCondition mongoCondition= MongoCondition.newInstance("hospitalName",hospitalName,MongoOper.IS); + MongoCondition mongoCondition1= MongoCondition.newInstance("transferredHospital",transferredHospital, MongoOper.IS); + condition=condition.andCondition(mongoCondition.orCondition(mongoCondition1)); + } + } + if(null!=outHospitalId){ + + condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS); + } return condition.toMongoQuery(); } 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 1440e40..9d9031a 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 @@ -257,18 +257,13 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone()); - + String hospital=autoMatchFacade.getHospitalId(userId); + referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) { - List data = autoMatchFacade.matchOrgId(userId); - if (CollectionUtils.isNotEmpty(data)) { - referralApplyOrderQuery.setTransferredHospital(data.get(0) + ""); - } + referralApplyOrderQuery.setTransferredHospital(hospital); } else if ("0".equals(applyOrderQueryRequest.getAction())) { - List data = autoMatchFacade.matchOrgId(userId); - if (CollectionUtils.isNotEmpty(data)) { - referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); - } + referralApplyOrderQuery.setOutHospitalId(hospital); } if(null!=applyOrderQueryRequest.getTyVip() &&Boolean.TRUE.equals(applyOrderQueryRequest.getTyVip())){ referralApplyOrderQuery.setExpVip(1); @@ -278,7 +273,6 @@ public class ApplyOrderFacade { if (CollectionUtils.isNotEmpty(orderModels)) { for (ReferralApplyOrderModel applyOrderModel : orderModels) { BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult(); - String zhuanchu = applyOrderModel.getOutHospitalId(); Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); String zhuanCName = "";