jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit c7b5cb00cfb39e5c2f15ebad908d9ae2464210d7

Authored by litao@lymsh.com
1 parent c8ad365940
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

quanxian

Showing 6 changed files with 57 additions and 18 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ c7b5cb0
... ... @@ -35,15 +35,15 @@
35 35 @ResponseBody
36 36 @RequestMapping(method = RequestMethod.POST)
37 37 @TokenRequired
38   - public BaseResponse addOrUpdate(TrackDown trackDown, HttpServletRequest request) {
39   - return trackDownService.addOrUpdate(getUserId(request), trackDown);
  38 + public BaseResponse add(TrackDown trackDown, HttpServletRequest request) {
  39 + return trackDownService.add(getUserId(request), trackDown);
40 40 }
41 41  
42 42 @ResponseBody
43 43 @TokenRequired
44 44 @RequestMapping(method = RequestMethod.GET)
45   - public BaseResponse list(String provinceId, String cityId, String areaId, String addressId, Integer trackType, Integer page, Integer limit, HttpServletRequest request) {
46   - return trackDownService.list(provinceId, cityId, areaId, addressId, trackType, page, limit, getUserId(request));
  45 + public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, HttpServletRequest request) {
  46 + return trackDownService.list(provinceId, cityId, areaId, streetId, trackType, page, limit, getUserId(request));
47 47 }
48 48  
49 49 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java View file @ c7b5cb0
... ... @@ -7,9 +7,9 @@
7 7  
8 8 public interface ITrackDownService extends IBaseService {
9 9  
10   - BaseResponse addOrUpdate(Integer userId, TrackDown trackDown);
  10 + BaseResponse add(Integer userId, TrackDown trackDown);
11 11  
12   - BaseResponse list(String provinceId, String cityId, String areaId, String addressId, Integer trackType, Integer page, Integer limit, Integer userId);
  12 + BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, Integer userId);
13 13  
14 14 BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId);
15 15  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ c7b5cb0
... ... @@ -94,9 +94,9 @@
94 94 @Override
95 95 public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
96 96 boolean flag = false;
97   - // List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
98   - Criteria criteria = Criteria.where("yn").is(1); //.and("hospitalId").in(hospitalIds);
99   - Criteria pCriteria = Criteria.where("yn").is(1); //.and("hospitalId").in(hospitalIds);
  97 + List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
  98 + Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds);
  99 + Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds);
100 100 if(StringUtils.isNotEmpty(key)) {
101 101 flag = true;
102 102 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ c7b5cb0
... ... @@ -77,7 +77,8 @@
77 77 }
78 78 Criteria criteria = Criteria.where("yn").is(1);
79 79 if(flag) {
80   - List<String> pids = mongoUtil.getPidsByCondition2(null, key, vcCardNo, weekStart, weekEnd, age);
  80 + List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
  81 + List<String> pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age);
81 82 criteria.and("pid").in(pids);
82 83 }
83 84 PageResult pageResult = findMongoPage(BloodSugar.class, Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ c7b5cb0
1 1 package com.lyms.platform.operate.web.service.impl;
2 2  
3 3 import com.lyms.platform.biz.service.TrackDownService;
  4 +import com.lyms.platform.common.enums.YnEnums;
4 5 import com.lyms.platform.common.result.BaseResponse;
5 6 import com.lyms.platform.common.result.RespBuilder;
  7 +import com.lyms.platform.common.utils.DateUtil;
  8 +import com.lyms.platform.common.utils.StringUtils;
6 9 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
7 10 import com.lyms.platform.operate.web.service.ITrackDownService;
8 11 import com.lyms.platform.operate.web.utils.MongoUtil;
  12 +import com.lyms.platform.pojo.Patients;
9 13 import com.lyms.platform.pojo.TrackDown;
10 14 import org.springframework.beans.factory.annotation.Autowired;
11 15 import org.springframework.data.mongodb.core.MongoTemplate;
12 16 import org.springframework.data.mongodb.core.query.Criteria;
  17 +import org.springframework.data.mongodb.core.query.Query;
13 18 import org.springframework.stereotype.Service;
14 19  
15 20 import java.util.Date;
  21 +import java.util.List;
16 22  
17 23 @Service
18 24 public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownService {
19 25  
20 26 @Autowired
21   - private TrackDownService TrackDownService;
  27 + private TrackDownService trackDownService;
22 28  
23 29 @Autowired
24 30 private MongoTemplate mongoTemplate;
25 31  
26 32  
27 33  
28 34  
29 35  
... ... @@ -31,21 +37,53 @@
31 37  
32 38 @Override
33 39 public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId) {
34   - Criteria criteria = new Criteria();
  40 + Criteria patientCriteria = new Criteria();
  41 + Criteria residentCriteria = new Criteria();
35 42 if(buildStart != null && buildEnd != null) {
36   -
  43 + residentCriteria.and("buildDay").gte(buildStart).lt(DateUtil.addDay(buildEnd, 1));
37 44 }
38   -
  45 + if(checkStart != null && checkEnd != null) {
  46 + patientCriteria.and("bookbuildingDate").gte(checkStart).lt(DateUtil.addDay(checkEnd, 1));
  47 + }
  48 + if(fmStart != null && fmEnd != null) {
  49 + patientCriteria.and("fmDate").gte(fmStart).lt(DateUtil.addDay(fmEnd, 1));
  50 + }
39 51 return null;
40 52 }
41 53  
42   - public BaseResponse addOrUpdate(Integer userId, TrackDown TrackDown) {
  54 + public BaseResponse add(Integer userId, TrackDown trackDown) {
43 55 String hospitalId = autoMatchFacade.getHospitalId(userId);
44   - return RespBuilder.buildSuccess();
  56 + String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId);
  57 + trackDown.setPid(mongoUtil.getPid(parentId));
  58 + trackDown.setParentId(parentId);
  59 + trackDown.setYn(YnEnums.YES.getId());
  60 + trackDown.setCreated(new Date());
  61 + trackDown.setHospitalId(hospitalId);
  62 + trackDown.setOperaterId(userId);
  63 + trackDown.setModified(new Date());
  64 + trackDownService.add(trackDown);
  65 + return RespBuilder.buildSuccess(trackDown.getId());
45 66 }
46 67  
47 68 @Override
48   - public BaseResponse list(String provinceId, String cityId, String areaId, String addressId, Integer trackType, Integer page, Integer limit, Integer userId) {
  69 + public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, Integer userId) {
  70 + Criteria criteria = new Criteria();
  71 + if(StringUtils.isNotEmpty(provinceId) || StringUtils.isNotEmpty(cityId) || StringUtils.isNotEmpty(areaId) || StringUtils.isNotEmpty(streetId) ) {
  72 + Criteria patientCriteria = new Criteria();
  73 + if(StringUtils.isNotEmpty(provinceId)) {
  74 + patientCriteria.and("provinceRegisterId").is(provinceId);
  75 + }
  76 + if(StringUtils.isNotEmpty(cityId)) {
  77 + patientCriteria.and("cityRegisterId").is(cityId);
  78 + }
  79 + if(StringUtils.isNotEmpty(areaId)) {
  80 + patientCriteria.and("areaRegisterId").is(areaId);
  81 + }
  82 + if(StringUtils.isNotEmpty(streetId)) {
  83 + patientCriteria.and("streetRegisterId").is(streetId);
  84 + }
  85 + List<Patients> patients = mongoTemplate.find(Query.query(patientCriteria.and("yn").is(1)), Patients.class);
  86 + }
49 87 return null;
50 88 }
51 89  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ c7b5cb0
... ... @@ -648,7 +648,7 @@
648 648 }
649 649  
650 650 public List<Patients> getPatientByCondition2(List<String> hospitalIds, String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age) {
651   - Criteria pCriteria = Criteria.where("yn").is(1);
  651 + Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds);
652 652 if(StringUtils.isNotEmpty(key)) {
653 653 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key));
654 654 }