jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 35dc7eabcb7aba1afc4d1828b0ac3db0615cf399

Authored by liquanyu
1 parent e85c22b2e7
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产后复查

Showing 4 changed files with 38 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java View file @ 35dc7ea
... ... @@ -130,8 +130,9 @@
130 130 @TokenRequired
131 131 @ResponseBody
132 132 public BaseObjectResponse postpartumReview(Date startDate, Date endDate, String doctorId,
  133 + Integer startDay, Integer endDay,
133 134 String key, Integer page, Integer limit, HttpServletRequest request) {
134   - return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit);
  135 + return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay);
135 136 }
136 137  
137 138 /**
138 139  
... ... @@ -145,8 +146,9 @@
145 146 @RequestMapping(method = RequestMethod.GET, value = "/postpartum/review/export")
146 147 @TokenRequired
147 148 public void postpartumReviewExport(Date startDate, Date endDate, String doctorId,
  149 + Integer startDay, Integer endDay,
148 150 String key, HttpServletRequest request, HttpServletResponse response) {
149   - postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key, response);
  151 + postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key, response,startDay, endDay);
150 152 }
151 153 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 35dc7ea
... ... @@ -1960,23 +1960,24 @@
1960 1960 if (childbirthManagerRequest.getWeight() != null)
1961 1961 {
1962 1962 BabyModelQuery babyModelQuery = new BabyModelQuery();
1963   - babyModelQuery.setDataStatus(false);
  1963 +// babyModelQuery.setDataStatus(false);
1964 1964 babyModelQuery.setHospitalId(hid);
1965 1965 babyModelQuery.setBuildType(2);
1966   -
  1966 + // // 1 ＜2500g、2 ≥4000g、3 ≥2500g与＜4000g之间
1967 1967 switch (childbirthManagerRequest.getWeight()) {
1968 1968 case 1:
1969   - babyModelQuery.setBabyWeightEnd(String.valueOf(2500 - 0.01));
  1969 + babyModelQuery.setBabyWeightEnd("2.49");
1970 1970 break;
1971 1971 case 2:
1972   - babyModelQuery.setBabyWeightStart(String.valueOf(4000));
  1972 + babyModelQuery.setBabyWeightStart("4");
1973 1973 break;
1974 1974 case 3:
1975   - babyModelQuery.setBabyWeightStart(String.valueOf(2500));
1976   - babyModelQuery.setBabyWeightEnd(String.valueOf(4000 - 0.01));
  1975 + babyModelQuery.setBabyWeightStart("2.5");
  1976 + babyModelQuery.setBabyWeightEnd("3.99");
1977 1977 break;
1978 1978 }
1979 1979 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
  1980 + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString());
1980 1981 List<String> babyParentIdList = new ArrayList<>();
1981 1982 for (BabyModel babyModel : babyModelList) {
1982 1983 babyParentIdList.add(babyModel.getParentId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java View file @ 35dc7ea
... ... @@ -9,8 +9,8 @@
9 9 * Created by litao on 2017/7/3 0003
10 10 */
11 11 public interface IPostReviewService extends IBaseService {
12   - BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit);
  12 + BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit,Integer startDay, Integer endDay);
13 13  
14   - void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response);
  14 + void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay);
15 15 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java View file @ 35dc7ea
... ... @@ -44,7 +44,10 @@
44 44 private MongoUtil mongoUtil;
45 45  
46 46 @Override
47   - public BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit) {
  47 + public BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page,
  48 + Integer limit,Integer startDay, Integer endDay) {
  49 +
  50 +
48 51 String hospitalId = autoMatchFacade.getHospitalId(userId);
49 52 Query query = Query.query(Criteria.where("hospitalId").is(hospitalId).and("yn").ne(0));
50 53 if(startDate != null && endDate != null) {
... ... @@ -54,6 +57,25 @@
54 57 query.addCriteria(Criteria.where("prodDoctor").is(doctorId));
55 58 }
56 59  
  60 + List<String> days = new ArrayList<>();
  61 + if (startDay != null && endDay != null && startDay <= endDay)
  62 + {
  63 + for (int i = startDay ; i <= endDay ; i++)
  64 + {
  65 + days.add("产后"+i+"天");
  66 + }
  67 + }
  68 + else if (startDay != null)
  69 + {
  70 + days.add("产后"+startDay+"天");
  71 + }
  72 + else if (endDay != null)
  73 + {
  74 + days.add("产后"+endDay+"天");
  75 + }
  76 +
  77 + query.addCriteria(Criteria.where("day").in(days));
  78 +
57 79 if(StringUtils.isNotEmpty(key)) {
58 80 Criteria criteria = new Criteria();
59 81 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 @@
107 129 }
108 130  
109 131 @Override
110   - public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response) {
111   - BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE);
  132 + public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay) {
  133 + BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay);
112 134 PageResult pageResult = (PageResult) rest.getData();
113 135 List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
114 136 Map<String, String> cnames = new LinkedHashMap<>();