jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 97cbf2fea8801c7fb76bffb51f84d875a4dc3980

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

追访增加查询条件

Showing 5 changed files with 166 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java View file @ 97cbf2f
... ... @@ -39,7 +39,7 @@
39 39 private String cityRegisterId;
40 40 private String areaRegisterId;
41 41 private String streetRegisterId;
42   -
  42 + //孕妇建档id
43 43 private String parentId;
44 44 //妇女建档id
45 45 private String residentsArchiveId;
platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java View file @ 97cbf2f
... ... @@ -38,10 +38,9 @@
38 38 }
39 39 if (null != number) {
40 40 condition = condition.and("number", number, MongoOper.IS);
41   - }
42   - /*else{
  41 + }else{
43 42 condition = condition.and("number", false, MongoOper.EXISTS);
44   - }*/
  43 + }
45 44 return condition.toMongoQuery();
46 45 }
47 46  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java View file @ 97cbf2f
... ... @@ -33,6 +33,7 @@
33 33 guidelinesQuery.setMaxStart(guideQuery.getNum());
34 34 guidelinesQuery.setMinEnd(guideQuery.getNum());
35 35 guidelinesQuery.setNumber(guideQuery.getTnum());
  36 + // System.out.println("指导意见查询条件："+guidelinesQuery.convertToQuery().convertToMongoQuery());
36 37 List<Guidelines> list = guidelinesService.queryGuidelines(guidelinesQuery);
37 38 StringBuilder stringBuilder=new StringBuilder(128);
38 39 if(CollectionUtils.isNotEmpty(list)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 97cbf2f
... ... @@ -138,6 +138,44 @@
138 138 * @return
139 139 */
140 140 private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest, Integer userId) {
  141 + if(downQueryRequest.getStartCheckTime()!=null){//产检开始日期
  142 +
  143 + }
  144 + if(downQueryRequest.getEndCheckTime()!=null){//产检结束日期
  145 +
  146 + }
  147 + if(downQueryRequest.getStartNextCheckTime()!=null){//下次产检开始日期
  148 +
  149 + }
  150 + if(downQueryRequest.getEndNextCheckTime()!=null){//下次产检结束日期
  151 +
  152 + }
  153 + if(downQueryRequest.getStartFmTime()!=null){//分娩开始日期
  154 +
  155 + }
  156 + if(downQueryRequest.getEndFmTime()!=null){//分娩结束日期
  157 +
  158 + }
  159 + if(downQueryRequest.getStartDueDate()!=null){//预产期开始日期
  160 +
  161 + }
  162 + if(downQueryRequest.getStartDueDate()!=null){//预产期结束日期
  163 +
  164 + }
  165 + if(downQueryRequest.getIsHightRisk()!=null){//是否高危
  166 +
  167 + }
  168 + if(downQueryRequest.getLevel()!=null){//高危等级
  169 +
  170 + }
  171 + if(downQueryRequest.getRiskFactorId()!=null){//高危因素
  172 +
  173 + }
  174 + if(downQueryRequest.getCheckDoctor()!=null){//产检医生
  175 +
  176 + }
  177 +
  178 +
141 179 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
142 180 downRecordQuery.setAreaId(downQueryRequest.getAreaId());
143 181 downRecordQuery.setProvinceId(downQueryRequest.getProvinceId());
... ... @@ -315,6 +353,8 @@
315 353 public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) {
316 354 //转换为本地的查询条件
317 355 TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
  356 +
  357 +
318 358 List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
319 359 List<Map> data = new ArrayList<>();
320 360 TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java View file @ 97cbf2f
1 1 package com.lyms.platform.operate.web.request;
2 2  
  3 +import java.util.Date;
  4 +
3 5 /**
4 6 * 添加类的一句话简单描述。
5 7 * <p/>
... ... @@ -8,7 +10,6 @@
8 10 * 示例代码
9 11 * <pre>
10 12 * </pre/>
11   - *
12 13 * @author JIAZHI.JIANG
13 14 * @version BME V100R001 2018-01-17 17:05
14 15 * @since BME V100R001C40B104
... ... @@ -20,6 +21,126 @@
20 21 private String streetId;
21 22 private String key;
22 23 private Integer trackType;
  24 + //开始产检开始日期
  25 + private Date startCheckTime;
  26 + //结束产检开始日期
  27 + private Date endCheckTime;
  28 + //结束预约下次产检日期
  29 + private Date startNextCheckTime;
  30 + //结束预约下次产检日期
  31 + private Date endNextCheckTime;
  32 + //是否高危
  33 + private Integer isHightRisk;
  34 + //高危等级
  35 + private String level;
  36 + //高危因素
  37 + private String riskFactorId;
  38 + //分娩结束日期
  39 + private Date startFmTime;
  40 + //分娩结束日期
  41 + private Date endFmTime;
  42 + //产检医生
  43 + private String checkDoctor;
  44 + //开始预产期
  45 + private Date startDueDate;
  46 + //开始预产期
  47 + private Date endDueDate;
  48 +
  49 + public String getCheckDoctor() {
  50 + return checkDoctor;
  51 + }
  52 +
  53 + public void setCheckDoctor(String checkDoctor) {
  54 + this.checkDoctor = checkDoctor;
  55 + }
  56 +
  57 + public Date getStartCheckTime() {
  58 + return startCheckTime;
  59 + }
  60 +
  61 + public void setStartCheckTime(Date startCheckTime) {
  62 + this.startCheckTime = startCheckTime;
  63 + }
  64 +
  65 + public Date getEndCheckTime() {
  66 + return endCheckTime;
  67 + }
  68 +
  69 + public void setEndCheckTime(Date endCheckTime) {
  70 + this.endCheckTime = endCheckTime;
  71 + }
  72 +
  73 + public Date getStartNextCheckTime() {
  74 + return startNextCheckTime;
  75 + }
  76 +
  77 + public void setStartNextCheckTime(Date startNextCheckTime) {
  78 + this.startNextCheckTime = startNextCheckTime;
  79 + }
  80 +
  81 + public Date getEndNextCheckTime() {
  82 + return endNextCheckTime;
  83 + }
  84 +
  85 + public void setEndNextCheckTime(Date endNextCheckTime) {
  86 + this.endNextCheckTime = endNextCheckTime;
  87 + }
  88 +
  89 + public Integer getIsHightRisk() {
  90 + return isHightRisk;
  91 + }
  92 +
  93 + public void setIsHightRisk(Integer isHightRisk) {
  94 + this.isHightRisk = isHightRisk;
  95 + }
  96 +
  97 + public String getLevel() {
  98 + return level;
  99 + }
  100 +
  101 + public void setLevel(String level) {
  102 + this.level = level;
  103 + }
  104 +
  105 + public String getRiskFactorId() {
  106 + return riskFactorId;
  107 + }
  108 +
  109 + public void setRiskFactorId(String riskFactorId) {
  110 + this.riskFactorId = riskFactorId;
  111 + }
  112 +
  113 + public Date getStartFmTime() {
  114 + return startFmTime;
  115 + }
  116 +
  117 + public void setStartFmTime(Date startFmTime) {
  118 + this.startFmTime = startFmTime;
  119 + }
  120 +
  121 + public Date getEndFmTime() {
  122 + return endFmTime;
  123 + }
  124 +
  125 + public void setEndFmTime(Date endFmTime) {
  126 + this.endFmTime = endFmTime;
  127 + }
  128 +
  129 + public Date getStartDueDate() {
  130 + return startDueDate;
  131 + }
  132 +
  133 + public void setStartDueDate(Date startDueDate) {
  134 + this.startDueDate = startDueDate;
  135 + }
  136 +
  137 + public Date getEndDueDate() {
  138 + return endDueDate;
  139 + }
  140 +
  141 + public void setEndDueDate(Date endDueDate) {
  142 + this.endDueDate = endDueDate;
  143 + }
23 144  
24 145 public String getProvinceId() {
25 146 return provinceId;