diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java index d4c6938..cb9e582 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java @@ -130,8 +130,9 @@ public class PostReviewController extends BaseController { @TokenRequired @ResponseBody public BaseObjectResponse postpartumReview(Date startDate, Date endDate, String doctorId, + Integer startDay, Integer endDay, String key, Integer page, Integer limit, HttpServletRequest request) { - return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit); + return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay); } /** @@ -145,7 +146,8 @@ public class PostReviewController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/postpartum/review/export") @TokenRequired public void postpartumReviewExport(Date startDate, Date endDate, String doctorId, + Integer startDay, Integer endDay, String key, HttpServletRequest request, HttpServletResponse response) { - postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key, response); + postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key, response,startDay, endDay); } } \ No newline at end of file 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 8ad4475..a6a5287 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 @@ -1960,23 +1960,24 @@ public class MatDeliverFacade { if (childbirthManagerRequest.getWeight() != null) { BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setDataStatus(false); +// babyModelQuery.setDataStatus(false); babyModelQuery.setHospitalId(hid); babyModelQuery.setBuildType(2); - + // // 1 <2500g、2 ≥4000g、3 ≥2500g与<4000g之间 switch (childbirthManagerRequest.getWeight()) { case 1: - babyModelQuery.setBabyWeightEnd(String.valueOf(2500 - 0.01)); + babyModelQuery.setBabyWeightEnd("2.49"); break; case 2: - babyModelQuery.setBabyWeightStart(String.valueOf(4000)); + babyModelQuery.setBabyWeightStart("4"); break; case 3: - babyModelQuery.setBabyWeightStart(String.valueOf(2500)); - babyModelQuery.setBabyWeightEnd(String.valueOf(4000 - 0.01)); + babyModelQuery.setBabyWeightStart("2.5"); + babyModelQuery.setBabyWeightEnd("3.99"); break; } List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); List babyParentIdList = new ArrayList<>(); for (BabyModel babyModel : babyModelList) { babyParentIdList.add(babyModel.getParentId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java index 78969e4..c9c88fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java @@ -9,7 +9,7 @@ import java.util.Date; * Created by litao on 2017/7/3 0003 */ public interface IPostReviewService extends IBaseService { - BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit); + BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit,Integer startDay, Integer endDay); - void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response); + void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java index 5bfb0db..9bdbdba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java @@ -44,7 +44,10 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie private MongoUtil mongoUtil; @Override - public BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit) { + public BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, + Integer limit,Integer startDay, Integer endDay) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); Query query = Query.query(Criteria.where("hospitalId").is(hospitalId).and("yn").ne(0)); if(startDate != null && endDate != null) { @@ -54,6 +57,25 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie query.addCriteria(Criteria.where("prodDoctor").is(doctorId)); } + List days = new ArrayList<>(); + if (startDay != null && endDay != null && startDay <= endDay) + { + for (int i = startDay ; i <= endDay ; i++) + { + days.add("产后"+i+"天"); + } + } + else if (startDay != null) + { + days.add("产后"+startDay+"天"); + } + else if (endDay != null) + { + days.add("产后"+endDay+"天"); + } + + query.addCriteria(Criteria.where("day").in(days)); + if(StringUtils.isNotEmpty(key)) { Criteria criteria = new Criteria(); criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key).and("yn").ne(0)); @@ -107,8 +129,8 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie } @Override - public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response) { - BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE); + public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay) { + BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay); PageResult pageResult = (PageResult) rest.getData(); List> datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>();