jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3e0b02fe733be7e241db65fe74600d09b7cf2e85

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

隆化-儿保登记统计，搜索框

Showing 8 changed files with 33 additions and 15 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 3e0b02f
... ... @@ -466,7 +466,7 @@
466 466  
467 467 /**隆化-增加 X线摄影报告
468 468 */
469   - //X摄影（1：正常，2：异常-需要写内容）
  469 + //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
470 470 private Integer xRay;
471 471 //异常情况填写内容
472 472 private String abnormalTxt;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java View file @ 3e0b02f
... ... @@ -25,6 +25,7 @@
25 25 import javax.servlet.http.HttpServletRequest;
26 26 import javax.servlet.http.HttpServletResponse;
27 27 import javax.validation.Valid;
  28 +import java.util.Date;
28 29  
29 30  
30 31 /**
31 32  
... ... @@ -73,9 +74,16 @@
73 74 @RequestParam(value = "waskSon", required = false) Integer waskSon,
74 75 @RequestParam(value = "checkDoctorId", required = false) String checkDoctorId,
75 76 @RequestParam(value = "level", required = false) String level,
  77 + @RequestParam(value = "queryStartBirth", required = false) Date queryStartBirth,
  78 + @RequestParam(value = "queryEndBirth", required = false) Date queryEndBirth,
  79 + @RequestParam(value = "provinceId", required = false) String provinceId,
  80 + @RequestParam(value = "provinceId", required = false) String cityId,
  81 + @RequestParam(value = "provinceId", required = false) String areaId,
  82 + @RequestParam(value = "provinceId", required = false) String streetId,
76 83 Integer page, Integer limit, HttpServletRequest request) {
77 84 return babyHealthFacade.babystatList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge,
78   - nextDate, highRisk, waskSon, checkDoctorId, page, limit, getUserId(request), level);
  85 + nextDate, highRisk, waskSon, checkDoctorId, page, limit, getUserId(request), level,queryStartBirth,
  86 + queryEndBirth,provinceId,cityId,areaId,streetId);
79 87 }
80 88  
81 89 @RequestMapping(value = "/queryBabyHealthStatPrint", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java View file @ 3e0b02f
... ... @@ -161,12 +161,29 @@
161 161  
162 162  
163 163 public BaseResponse babystatList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate,
164   - Integer highRisk, Integer waskSon, String checkDoctorId, Integer page, Integer limit, Integer userId, String level) {
  164 + Integer highRisk, Integer waskSon, String checkDoctorId, Integer page, Integer limit, Integer userId,
  165 + String level,Date queryStartBirth,Date queryEndtBirth,String provinceId,String cityId,
  166 + String areaId,String streetId) {
165 167 boolean flag = false;
166 168 // List<String> hospital = groupsFacade.findGroupHospital(userId, false);
167 169 int[] monthArr = {0, 3, 4, 8, 12, 18, 24, 30, 36, 48, 60, 72};//月龄
168 170 String hospitalId = autoMatchFacade.getHospitalId(userId);
169 171 Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId);
  172 + if(StringUtils.isNotEmpty(provinceId)){
  173 + criteria.and("provinceId").is(provinceId);
  174 + }
  175 + if(StringUtils.isNotEmpty(provinceId)){
  176 + criteria.and("cityId").is(cityId);
  177 + }
  178 + if(StringUtils.isNotEmpty(provinceId)){
  179 + criteria.and("areaId").is(areaId);
  180 + }
  181 + if(StringUtils.isNotEmpty(provinceId)){
  182 + criteria.and("streetId").is(streetId);
  183 + }
  184 + if(null!=queryStartBirth&&null!=queryEndtBirth){
  185 + criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth);
  186 + }
170 187 Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId);
171 188 if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
172 189 pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 3e0b02f
... ... @@ -496,7 +496,7 @@
496 496 checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode()));
497 497 /**隆化-增加 X线摄影报告
498 498 */
499   - //X摄影（1：正常，2：异常-需要写内容）
  499 + //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
500 500 checkupResult.setxRay(result.getxRay());
501 501 //异常情况填写内容
502 502 checkupResult.setAbnormalTxt(result.getAbnormalTxt());
... ... @@ -957,7 +957,7 @@
957 957  
958 958 /**隆化-增加 X线摄影报告
959 959 */
960   - //X摄影（1：正常，2：异常-需要写内容）
  960 + //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
961 961 checkup.setxRay(addRequest.getxRay());
962 962 //异常情况填写内容
963 963 checkup.setAbnormalTxt(addRequest.getAbnormalTxt());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ 3e0b02f
... ... @@ -455,7 +455,7 @@
455 455  
456 456 /**隆化-增加 X线摄影报告
457 457 */
458   - //X摄影（1：正常，2：异常-需要写内容）
  458 + //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
459 459 private Integer xRay;
460 460 //异常情况填写内容
461 461 private String abnormalTxt;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java View file @ 3e0b02f
... ... @@ -419,7 +419,7 @@
419 419 private String cxNum;
420 420 /**隆化-增加 X线摄影报告
421 421 */
422   - //X摄影（1：正常，2：异常-需要写内容）
  422 + //X摄影（1：正常，2：异常-需要写内容 3:怀孕未检查）
423 423 private Integer xRay;
424 424 //异常情况填写内容
425 425 private String abnormalTxt;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java View file @ 3e0b02f
... ... @@ -430,7 +430,7 @@
430 430  
431 431 /**隆化-增加 X线摄影报告
432 432 */
433   - //X摄影（1：正常，2：异常-需要写内容）
  433 + //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
434 434 private Integer xRay;
435 435 //异常情况填写内容
436 436 private String abnormalTxt;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java View file @ 3e0b02f
... ... @@ -341,13 +341,6 @@
341 341 }
342 342 if(null!=recordUpdateModel.getStartTime()&&null!=recordUpdateModel.getEndTime()){
343 343 criteria.and("created").gte(recordUpdateModel.getStartTime()).lte(recordUpdateModel.getEndTime());
344   - }else{
345   - if(null!=recordUpdateModel.getStartTime()){
346   - criteria.and("created").gte(recordUpdateModel.getStartTime());
347   - }
348   - if(null!=recordUpdateModel.getEndTime()){
349   - criteria.and("created").lte(recordUpdateModel.getEndTime());
350   - }
351 344 }
352 345  
353 346 PageResult pageResult = findMongoPage(TeamRecordUpdateModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);