From 69cb5c29607bd92031fc164ff73290d47a87e16b Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 7 Dec 2017 16:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E9=9A=8F=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/MatDeliverService.java | 2 +- .../com/lyms/platform/query/MatDeliverQuery.java | 25 +++++++++++++++++----- .../operate/web/facade/MatDeliverFacade.java | 4 +--- .../operate/web/facade/MatdeliverFollowFacade.java | 8 +++---- .../web/request/MatdeliverFollowRequest.java | 12 +++++++++++ 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java index ea37d77..4ea2772 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java @@ -60,6 +60,6 @@ public class MatDeliverService { MongoQuery mongoQuery = matDeliverQuery.convertToQuery(); matDeliverQuery.mysqlBuild(iMatDeliverDao.count(matDeliverQuery.convertToQuery())); mongoQuery.start(matDeliverQuery.getOffset()).end(matDeliverQuery.getLimit()); - return iMatDeliverDao.pageQuery(mongoQuery.addOrder(Sort.Direction.DESC, "dueDate1")); + return iMatDeliverDao.pageQuery(mongoQuery.addOrder(Sort.Direction.DESC, "created")); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 460623a..8c00e55 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -32,6 +32,11 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private boolean neEnd; + /** + * 是否有效 + */ + private Integer yn; + private String deliveryModeQueryJson; private String fmHospital; private List fmHospitalList; @@ -44,6 +49,10 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery * 预约失败理由（1-无人接听电话、2-拒绝访视、3-其他） */ private Integer contactReason; + /** + * 访视类型 1、上门访视 2、电话访视 + */ + private Integer makeType; /** * 访视状态（1-待访视、2-已访视） @@ -64,6 +73,14 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery */ private String matFollowId; + public Integer getMakeType() { + return makeType; + } + + public void setMakeType(Integer makeType) { + this.makeType = makeType; + } + public Integer getVisitStatus() { return visitStatus; } @@ -176,11 +193,6 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery this.endStart = endStart; } - /** - * 是否有效 - */ - private Integer yn; - public String getPid() { return pid; } @@ -227,6 +239,9 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery if (null != contactResult) { condition = condition.and("contactResult", contactResult, MongoOper.IS); } + if (null != makeType) { + condition = condition.and("makeType", makeType, MongoOper.IS); + } if (null != contactReason) { condition = condition.and("contactReason", contactReason, MongoOper.IS); } 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 507c87b..4e86c5c 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 @@ -1236,7 +1236,7 @@ public class MatDeliverFacade { matDeliverQuery.setVisitResult(matdeliverFollowRequest.getVisitResult()); matDeliverQuery.setVisitAffirm(matdeliverFollowRequest.getVisitAffirm()); matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); - + matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType()); List maternalDeliverModelList; if(StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())){//是否分页 @@ -1248,8 +1248,6 @@ public class MatDeliverFacade { maternalDeliverModelList = matDeliverService.query(matDeliverQuery); } - - if (CollectionUtils.isEmpty(maternalDeliverModelList)) { // 没有查到，直接抛出 return listResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index 6125bff..abef171 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -351,7 +351,7 @@ public class MatdeliverFollowFacade { cnames.put("address", "居住地"); cnames.put("phone", "联系电话"); cnames.put("contactResultStr", "联系状态"); - cnames.put("visitAffirm", "产妇确认"); + // cnames.put("visitAffirm", "产妇确认"); cnames.put("makeType", "访视类型"); cnames.put("visitResult", "访视结果"); cnames.put("nextVisitDate", "下次随访"); @@ -367,17 +367,17 @@ public class MatdeliverFollowFacade { result.put("hospitalCityName", mf.getHospitalCityName()); result.put("hospitalAreaName", mf.getHospitalAreaName()); result.put("name", mf.getName()); - result.put("age", String.valueOf(mf.getAge())); + result.put("age", mf.getAge()==null?"--":String.valueOf(mf.getAge())); result.put("fmHospital", mf.getFmHospital()); result.put("postViewDay", mf.getPostViewDay()); result.put("address", mf.getAddress()); result.put("phone", mf.getPhone()); - if(StringUtils.isNotEmpty(mf.getContactResultStr())){ + if(StringUtils.isEmpty(mf.getContactResultStr())){ result.put("contactResultStr", "待联系"); }else{ result.put("contactResultStr", mf.getContactResultStr()); } - result.put("visitAffirm", mf.getVisitAffirm()); + // result.put("visitAffirm", mf.getVisitAffirm()); result.put("makeType", mf.getMakeType()); result.put("visitResult",mf.getVisitResult()); result.put("nextVisitDate", mf.getNextVisitDate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java index 53b48c2..c96d19a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java @@ -63,6 +63,10 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ */ private Integer visitStatus; /** + * 预约访视类型（1-上门访视、2-电话访视） + */ + private Integer makeType; + /** * 访视结果（1-成功、2-失败） */ private Integer visitResult; @@ -75,6 +79,14 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ */ private String need; + public Integer getMakeType() { + return makeType; + } + + public void setMakeType(Integer makeType) { + this.makeType = makeType; + } + public String getNeed() { return need; } -- 1.8.3.1