jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 88ebd74e17eebb3141372368a3b65fda37c99e94

Authored by jiangjiazhi
2 parents 51ead6d898 c7b5cb00cf
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 16 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITrackDownDao.java View file @ 88ebd74
  1 +package com.lyms.platform.biz.dal;
  2 +
  3 +import com.lyms.platform.pojo.TrackDown;
  4 +import org.springframework.data.mongodb.core.query.Query;
  5 +
  6 +public interface ITrackDownDao {
  7 +
  8 + void add(TrackDown TrackDown);
  9 +
  10 + void updateXy(Query query, TrackDown TrackDown);
  11 +
  12 +}
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TrackDownDaoImpl.java View file @ 88ebd74
  1 +package com.lyms.platform.biz.dal.impl;
  2 +
  3 +import com.lyms.platform.biz.dal.ITrackDownDao;
  4 +import com.lyms.platform.common.dao.BaseMongoDAOImpl;
  5 +import com.lyms.platform.pojo.TrackDown;
  6 +import org.springframework.data.mongodb.core.query.Query;
  7 +import org.springframework.stereotype.Repository;
  8 +
  9 +@Repository
  10 +public class TrackDownDaoImpl extends BaseMongoDAOImpl<TrackDown> implements ITrackDownDao {
  11 +
  12 + @Override
  13 + public void add(TrackDown TrackDown) {
  14 + save(TrackDown);
  15 + }
  16 +
  17 + @Override
  18 + public void updateXy(Query query, TrackDown TrackDown) {
  19 + update(query, TrackDown);
  20 + }
  21 +
  22 +}
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownService.java View file @ 88ebd74
  1 +package com.lyms.platform.biz.service;
  2 +
  3 +
  4 +import com.lyms.platform.biz.dal.ITrackDownDao;
  5 +import com.lyms.platform.pojo.TrackDown;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.data.mongodb.core.query.Criteria;
  8 +import org.springframework.data.mongodb.core.query.Query;
  9 +import org.springframework.stereotype.Service;
  10 +
  11 +@Service
  12 +public class TrackDownService {
  13 +
  14 + @Autowired
  15 + private ITrackDownDao trackDownDao;
  16 +
  17 + public void add(TrackDown TrackDown) {
  18 + trackDownDao.add(TrackDown);
  19 + }
  20 +
  21 + public void update(TrackDown TrackDown) {
  22 + trackDownDao.updateXy(Query.query(Criteria.where("id").is(TrackDown.getId())), TrackDown);
  23 + }
  24 +
  25 +}
platform-common/src/main/java/com/lyms/platform/common/enums/SpecialDateEnums.java View file @ 88ebd74
... ... @@ -25,7 +25,8 @@
25 25 YZ(10,"ๅญ•ๅ‘จ",3,"1","0"),
26 26 ETTS(11,"ๅ„ฟ็ซฅๅคฉๆ•ฐ",3,"2","0"),
27 27 ETYL(12,"ๅ„ฟ็ซฅๆœˆ้พ„",3,"2","0"),
28   - CHTS(13,"ไบงๅŽๅคฉๆ•ฐ",3,"3","0");
  28 + CHTS(13,"ไบงๅŽๅคฉๆ•ฐ",3,"3","0"),
  29 + ETFWTG(14,"ๅ„ฟ็ซฅๆœๅŠกๆŽจๅนฟ",2,"2","0");
29 30 SpecialDateEnums(int id, String name,int pid,String serviceObj,String freq) {
30 31 this.id = id;
31 32 this.name = name;
platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java View file @ 88ebd74
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import com.lyms.platform.common.utils.StringUtils;
  4 +
  5 +/**
  6 + * ่ฟฝ่ฎฟๆ•ฐๆฎไฟๅญ˜็š„็ฑปๅž‹
  7 + */
  8 +public enum TrackDownDateEnums {
  9 + A(1, "ๅฉšๅ‰ๆฃ€ๆŸฅ"),
  10 + B(2, "ๆ€€ๅญ•ๅปบๆกฃ"),
  11 + C(3, "ๅญ•ๆœŸๆฃ€ๆŸฅ"),
  12 + D(4, "ไบงๅ‰็ญ›ๆŸฅ"),
  13 + E(3, "ๅˆ†ๅจฉไฝ้™ข"),
  14 + F(3, "ไบงๅŽ่ฎฟ่ง†"),
  15 + G(3, "ไบงๅŽๅคๆŸฅ");
  16 +
  17 + TrackDownDateEnums(Integer id, String name) {
  18 + this.id = id;
  19 + this.name = name;
  20 + }
  21 +
  22 +
  23 + public static String getName(String id) {
  24 + if(StringUtils.isEmpty(id)) {
  25 + return null;
  26 + }
  27 + TrackDownDateEnums[] values = TrackDownDateEnums.values();
  28 + for (TrackDownDateEnums value : values) {
  29 + if (value.getId().equals(id)) {
  30 + return value.getName();
  31 + }
  32 + }
  33 + return null;
  34 + }
  35 + private Integer id;
  36 + private String name;
  37 +
  38 + public Integer getId() {
  39 + return id;
  40 + }
  41 +
  42 + public void setId(Integer id) {
  43 + this.id = id;
  44 + }
  45 +
  46 + public String getName() {
  47 + return name;
  48 + }
  49 +
  50 + public void setName(String name) {
  51 + this.name = name;
  52 + }
  53 +
  54 +}
platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownTransferEnums.java View file @ 88ebd74
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import com.lyms.platform.common.utils.StringUtils;
  4 +
  5 +/**
  6 + * ่ฟฝ่ฎฟ่ฝฌๆŽฅ
  7 + */
  8 +public enum TrackDownTransferEnums {
  9 + A(1, "ๅœ็•™ๅฝ“ๅ‰ๆต็จ‹"),
  10 + B(2, "ๆต่ฝฌ่‡ณไธ‹ไธ€ๆต็จ‹"),
  11 + C(3, "ๅœๆญขๆ‰€ๆœ‰ๆต็จ‹");
  12 +
  13 + TrackDownTransferEnums(Integer id, String name) {
  14 + this.id = id;
  15 + this.name = name;
  16 + }
  17 +
  18 +
  19 + public static String getName(String id) {
  20 + if(StringUtils.isEmpty(id)) {
  21 + return null;
  22 + }
  23 + TrackDownTransferEnums[] values = TrackDownTransferEnums.values();
  24 + for (TrackDownTransferEnums value : values) {
  25 + if (value.getId().equals(id)) {
  26 + return value.getName();
  27 + }
  28 + }
  29 + return null;
  30 + }
  31 + private Integer id;
  32 + private String name;
  33 +
  34 + public Integer getId() {
  35 + return id;
  36 + }
  37 +
  38 + public void setId(Integer id) {
  39 + this.id = id;
  40 + }
  41 +
  42 + public String getName() {
  43 + return name;
  44 + }
  45 +
  46 + public void setName(String name) {
  47 + this.name = name;
  48 + }
  49 +
  50 +}
platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownTypeEnums.java View file @ 88ebd74
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import com.lyms.platform.common.utils.StringUtils;
  4 +
  5 +/**
  6 + * ่ฟฝ่ฎฟๆ–นๅผ
  7 + */
  8 +public enum TrackDownTypeEnums {
  9 + A(1, "็”ต่ฏ่”็ณป"),
  10 + B(2, "็Ÿญไฟกๆ้†’"),
  11 + C(3, "ไธŠ้—จ่ฎฟ่ง†"),
  12 + D(4, "APP่Šๅคฉ");
  13 +
  14 + TrackDownTypeEnums(Integer id, String name) {
  15 + this.id = id;
  16 + this.name = name;
  17 + }
  18 +
  19 +
  20 + public static String getName(String id) {
  21 + if(StringUtils.isEmpty(id)) {
  22 + return null;
  23 + }
  24 + TrackDownTypeEnums[] values = TrackDownTypeEnums.values();
  25 + for (TrackDownTypeEnums value : values) {
  26 + if (value.getId().equals(id)) {
  27 + return value.getName();
  28 + }
  29 + }
  30 + return null;
  31 + }
  32 + private Integer id;
  33 + private String name;
  34 +
  35 + public Integer getId() {
  36 + return id;
  37 + }
  38 +
  39 + public void setId(Integer id) {
  40 + this.id = id;
  41 + }
  42 +
  43 + public String getName() {
  44 + return name;
  45 + }
  46 +
  47 + public void setName(String name) {
  48 + this.name = name;
  49 + }
  50 +
  51 +}
platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java View file @ 88ebd74
... ... @@ -60,6 +60,7 @@
60 60 BloodPressure("BloodPressure", 97531333111L),
61 61 BloodSugar("BloodSugar", 97111333111L),
62 62 TempModel("TempModel", 97111333112L),
  63 + TrackDown("TrackDown", 97222333112L),
63 64 last("last", 97531009990L);
64 65 private String cname;
65 66 private Long cid;
platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java View file @ 88ebd74
  1 +package com.lyms.platform.pojo;
  2 +
  3 +import com.lyms.platform.beans.SerialIdEnum;
  4 +import com.lyms.platform.common.result.BaseModel;
  5 +import org.springframework.data.mongodb.core.mapping.Document;
  6 +
  7 +import java.util.Date;
  8 +
  9 +/**
  10 + * ่ฟฝ่ฎฟ
  11 + */
  12 +@Document(collection="lyms_track_down")
  13 +public class TrackDown extends BaseModel {
  14 +
  15 + private static final long serialVersionUID = SerialIdEnum.TrackDown.getCid();
  16 +
  17 + private String id;
  18 +
  19 + private String parentId;
  20 +
  21 + private String pid;
  22 +
  23 + private Date created;
  24 +
  25 + private Date modified;
  26 +
  27 + private Integer yn;
  28 +
  29 + private Integer operaterId;
  30 +
  31 + private String hospitalId;
  32 +
  33 + /**
  34 + * ่ฟฝ่ฎฟๆ—ถ้—ด
  35 + */
  36 + private Date trackDownDate;
  37 +
  38 + /**
  39 + * ่ฟฝ่ฎฟไบบ
  40 + */
  41 + private String trackDownUserId;
  42 +
  43 + /**
  44 + * ่ฟฝ่ฎฟๆ–นๅผ
  45 + */
  46 + private Integer trackDownType;
  47 +
  48 + /**
  49 + * ๆ˜ฏๅฆ้ข„็บฆ
  50 + */
  51 + private boolean isReservat;
  52 +
  53 + /**
  54 + * ้ข„็บฆๆ—ถ้—ด
  55 + */
  56 + private Date reservatDate;
  57 +
  58 + /**
  59 + * ่ฟฝ่ฎฟ่ฝฌๆŽฅ
  60 + */
  61 + private Integer trackDownTransfer;
  62 +
  63 + public String getId() {
  64 + return id;
  65 + }
  66 +
  67 + public void setId(String id) {
  68 + this.id = id;
  69 + }
  70 +
  71 + public String getParentId() {
  72 + return parentId;
  73 + }
  74 +
  75 + public void setParentId(String parentId) {
  76 + this.parentId = parentId;
  77 + }
  78 +
  79 + public String getPid() {
  80 + return pid;
  81 + }
  82 +
  83 + public void setPid(String pid) {
  84 + this.pid = pid;
  85 + }
  86 +
  87 + public Date getCreated() {
  88 + return created;
  89 + }
  90 +
  91 + public void setCreated(Date created) {
  92 + this.created = created;
  93 + }
  94 +
  95 + public Date getModified() {
  96 + return modified;
  97 + }
  98 +
  99 + public void setModified(Date modified) {
  100 + this.modified = modified;
  101 + }
  102 +
  103 + public Integer getYn() {
  104 + return yn;
  105 + }
  106 +
  107 + public void setYn(Integer yn) {
  108 + this.yn = yn;
  109 + }
  110 +
  111 + public Integer getOperaterId() {
  112 + return operaterId;
  113 + }
  114 +
  115 + public void setOperaterId(Integer operaterId) {
  116 + this.operaterId = operaterId;
  117 + }
  118 +
  119 + public String getHospitalId() {
  120 + return hospitalId;
  121 + }
  122 +
  123 + public void setHospitalId(String hospitalId) {
  124 + this.hospitalId = hospitalId;
  125 + }
  126 +
  127 + public Date getTrackDownDate() {
  128 + return trackDownDate;
  129 + }
  130 +
  131 + public void setTrackDownDate(Date trackDownDate) {
  132 + this.trackDownDate = trackDownDate;
  133 + }
  134 +
  135 + public String getTrackDownUserId() {
  136 + return trackDownUserId;
  137 + }
  138 +
  139 + public void setTrackDownUserId(String trackDownUserId) {
  140 + this.trackDownUserId = trackDownUserId;
  141 + }
  142 +
  143 + public Integer getTrackDownType() {
  144 + return trackDownType;
  145 + }
  146 +
  147 + public void setTrackDownType(Integer trackDownType) {
  148 + this.trackDownType = trackDownType;
  149 + }
  150 +
  151 + public boolean isReservat() {
  152 + return isReservat;
  153 + }
  154 +
  155 + public void setReservat(boolean reservat) {
  156 + isReservat = reservat;
  157 + }
  158 +
  159 + public Date getReservatDate() {
  160 + return reservatDate;
  161 + }
  162 +
  163 + public void setReservatDate(Date reservatDate) {
  164 + this.reservatDate = reservatDate;
  165 + }
  166 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ 88ebd74
  1 +package com.lyms.platform.operate.web.controller;
  2 +
  3 +import com.lyms.platform.common.annotation.TokenRequired;
  4 +import com.lyms.platform.common.base.BaseController;
  5 +import com.lyms.platform.common.result.BaseResponse;
  6 +import com.lyms.platform.operate.web.service.ITrackDownService;
  7 +import com.lyms.platform.pojo.TrackDown;
  8 +import org.springframework.beans.factory.annotation.Autowired;
  9 +import org.springframework.stereotype.Controller;
  10 +import org.springframework.web.bind.annotation.PathVariable;
  11 +import org.springframework.web.bind.annotation.RequestMapping;
  12 +import org.springframework.web.bind.annotation.RequestMethod;
  13 +import org.springframework.web.bind.annotation.ResponseBody;
  14 +
  15 +import javax.servlet.http.HttpServletRequest;
  16 +import java.util.Date;
  17 +
  18 +/**
  19 + * ่ฟฝ่ฎฟ
  20 + */
  21 +@Controller
  22 +@RequestMapping("/track/down")
  23 +public class TrackDownController extends BaseController {
  24 +
  25 + @Autowired
  26 + private ITrackDownService trackDownService;
  27 +
  28 + @ResponseBody
  29 + @TokenRequired
  30 + @RequestMapping(value = "/all", method = RequestMethod.GET)
  31 + public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, HttpServletRequest request) {
  32 + return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request));
  33 + }
  34 +
  35 + @ResponseBody
  36 + @RequestMapping(method = RequestMethod.POST)
  37 + @TokenRequired
  38 + public BaseResponse add(TrackDown trackDown, HttpServletRequest request) {
  39 + return trackDownService.add(getUserId(request), trackDown);
  40 + }
  41 +
  42 + @ResponseBody
  43 + @TokenRequired
  44 + @RequestMapping(method = RequestMethod.GET)
  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 + }
  48 +
  49 + @ResponseBody
  50 + @RequestMapping(value = "/{parentId}/{trackType}", method = RequestMethod.GET)
  51 + @TokenRequired
  52 + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType) {
  53 + return trackDownService.info(parentId, trackType);
  54 + }
  55 +
  56 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ 88ebd74
... ... @@ -53,6 +53,7 @@
53 53  
54 54 smsTemplateService.deleteTempById(request.getId());
55 55 model.setId(request.getId());
  56 + model.setCreated(list.get(0).getCreated());
56 57 smsTemplateService.addSmsTemplate(model);
57 58  
58 59 if (CollectionUtils.isNotEmpty(list))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java View file @ 88ebd74
  1 +package com.lyms.platform.operate.web.service;
  2 +
  3 +import com.lyms.platform.common.result.BaseResponse;
  4 +import com.lyms.platform.pojo.TrackDown;
  5 +
  6 +import java.util.Date;
  7 +
  8 +public interface ITrackDownService extends IBaseService {
  9 +
  10 + BaseResponse add(Integer userId, TrackDown trackDown);
  11 +
  12 + BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, Integer userId);
  13 +
  14 + BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId);
  15 +
  16 + BaseResponse info(String patientId, Integer trackType);
  17 +
  18 + BaseResponse init();
  19 +
  20 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 88ebd74
... ... @@ -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 @ 88ebd74
... ... @@ -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 @ 88ebd74
  1 +package com.lyms.platform.operate.web.service.impl;
  2 +
  3 +import com.lyms.platform.biz.service.TrackDownService;
  4 +import com.lyms.platform.common.enums.YnEnums;
  5 +import com.lyms.platform.common.result.BaseResponse;
  6 +import com.lyms.platform.common.result.RespBuilder;
  7 +import com.lyms.platform.common.utils.DateUtil;
  8 +import com.lyms.platform.common.utils.StringUtils;
  9 +import com.lyms.platform.operate.web.facade.AutoMatchFacade;
  10 +import com.lyms.platform.operate.web.service.ITrackDownService;
  11 +import com.lyms.platform.operate.web.utils.MongoUtil;
  12 +import com.lyms.platform.pojo.Patients;
  13 +import com.lyms.platform.pojo.TrackDown;
  14 +import org.springframework.beans.factory.annotation.Autowired;
  15 +import org.springframework.data.mongodb.core.MongoTemplate;
  16 +import org.springframework.data.mongodb.core.query.Criteria;
  17 +import org.springframework.data.mongodb.core.query.Query;
  18 +import org.springframework.stereotype.Service;
  19 +
  20 +import java.util.Date;
  21 +import java.util.List;
  22 +
  23 +@Service
  24 +public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownService {
  25 +
  26 + @Autowired
  27 + private TrackDownService trackDownService;
  28 +
  29 + @Autowired
  30 + private MongoTemplate mongoTemplate;
  31 +
  32 + @Autowired
  33 + private AutoMatchFacade autoMatchFacade;
  34 +
  35 + @Autowired
  36 + private MongoUtil mongoUtil;
  37 +
  38 + @Override
  39 + public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId) {
  40 + Criteria patientCriteria = new Criteria();
  41 + Criteria residentCriteria = new Criteria();
  42 + if(buildStart != null && buildEnd != null) {
  43 + residentCriteria.and("buildDay").gte(buildStart).lt(DateUtil.addDay(buildEnd, 1));
  44 + }
  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 + }
  51 + return null;
  52 + }
  53 +
  54 + public BaseResponse add(Integer userId, TrackDown trackDown) {
  55 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  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());
  66 + }
  67 +
  68 + @Override
  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 + }
  87 + return null;
  88 + }
  89 +
  90 + @Override
  91 + public BaseResponse info(String patientId, Integer trackType) {
  92 + return null;
  93 + }
  94 +
  95 + @Override
  96 + public BaseResponse init() {
  97 + return null;
  98 + }
  99 +
  100 +
  101 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 88ebd74
... ... @@ -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 }