jiangjiazhi / regional-platform

Download as
Browse Code »

Commit eb57300644217f5b618642346df85f842f474023

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

update

Showing 10 changed files with 665 additions and 416 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITrackDownRecordDao.java View file @ eb57300
... ... @@ -39,5 +39,7 @@
39 39 Page<TrackDownRecord> findPage(MongoQuery query);
40 40  
41 41 void findAndModify(MongoQuery query, TrackDownRecord obj);
  42 +
  43 + public void updateTrackDownOneCol(String id, Object colValue);
42 44 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TrackDownRecordDaoImpl.java View file @ eb57300
... ... @@ -11,6 +11,9 @@
11 11 import org.bson.types.ObjectId;
12 12 import org.slf4j.Logger;
13 13 import org.slf4j.LoggerFactory;
  14 +import org.springframework.data.mongodb.core.query.Criteria;
  15 +import org.springframework.data.mongodb.core.query.Query;
  16 +import org.springframework.data.mongodb.core.query.Update;
14 17 import org.springframework.stereotype.Repository;
15 18  
16 19 import java.util.List;
... ... @@ -72,6 +75,15 @@
72 75 @Override
73 76 public List<TrackDownRecord> queryTrackDown(MongoQuery query) {
74 77 return find(query.convertToMongoQuery());
  78 + }
  79 +
  80 +
  81 +
  82 + @Override
  83 + public void updateTrackDownOneCol(String id, Object colValue) {
  84 + this.mongoTemplate.updateFirst(new Query(Criteria.where("id").is(id)), Update.update("nextCheckTime", colValue), TrackDownRecord.class);
  85 + //为了使修改为空的时候能够同步到线上
  86 + updateTrackDown(findById(id), id);
75 87 }
76 88  
77 89 @Override
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java View file @ eb57300
... ... @@ -74,7 +74,7 @@
74 74 }
75 75  
76 76 public void findAndMoidify(TrackDownRecordQuery query,TrackDownRecord downRecord){
77   - iTrackDownRecordDao.findAndModify(query.convertToQuery(),downRecord);
  77 + iTrackDownRecordDao.findAndModify(query.convertToQuery(), downRecord);
78 78 }
79 79  
80 80 public void updateTrackDown(TrackDownRecord obj, String id) {
... ... @@ -105,6 +105,11 @@
105 105 query1.start(query.getOffset()).end(query.getLimit());
106 106 }
107 107 return iTrackDownRecordDao.queryTrackDown(query1.addOrder(Sort.Direction.DESC, "modified"));
  108 + }
  109 +
  110 + public void updateTrackDownOneCol(String id, Object colValue)
  111 + {
  112 + iTrackDownRecordDao.updateTrackDownOneCol(id,colValue);
108 113 }
109 114 }
platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java View file @ eb57300
... ... @@ -60,6 +60,9 @@
60 60 //预约追访日期
61 61 private Date appointmentDate;
62 62  
  63 + //产检预约时间
  64 + private Date nextCheckTime;
  65 +
63 66 //追访日期
64 67 private Date trackDownDate;
65 68 //是否终止流程
... ... @@ -82,6 +85,14 @@
82 85 private boolean isHistory;
83 86  
84 87 private String trackHospitalId;
  88 +
  89 + public Date getNextCheckTime() {
  90 + return nextCheckTime;
  91 + }
  92 +
  93 + public void setNextCheckTime(Date nextCheckTime) {
  94 + this.nextCheckTime = nextCheckTime;
  95 + }
85 96  
86 97 public String getTrackHospitalId() {
87 98 return trackHospitalId;
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ eb57300
... ... @@ -703,7 +703,15 @@
703 703  
704 704 if (null != nextCheckTimeEnd) {
705 705 if (null != c) {
706   - c = c.lte(nextCheckTimeEnd);
  706 + if (c.getCriteriaObject().containsField("nextCheckTimeEnd"))
  707 + {
  708 + c = c.lte(nextCheckTimeEnd);
  709 + }
  710 + else
  711 + {
  712 + c = c.and("nextCheckTime").lte(nextCheckTimeEnd);
  713 + }
  714 +
707 715 } else {
708 716 c = Criteria.where("nextCheckTime").lte(nextCheckTimeEnd);
709 717 }
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java View file @ eb57300
... ... @@ -72,7 +72,11 @@
72 72 //预约结束追访日期
73 73 private Date appointmentDateEnd;
74 74  
  75 + //产检预约逾期天数
  76 + private Date checkOverDaysStart;
  77 + private Date checkOverDaysEnd;
75 78  
  79 +
76 80 //追访状态 0 正常 1. 待追访 2.已终止
77 81 private Integer followupStatus;
78 82  
79 83  
... ... @@ -97,279 +101,7 @@
97 101  
98 102 private String trackHospitalId;
99 103  
100   - public String getTrackHospitalId() {
101   - return trackHospitalId;
102   - }
103 104  
104   - public void setTrackHospitalId(String trackHospitalId) {
105   - this.trackHospitalId = trackHospitalId;
106   - }
107   -
108   - public List<String> getHospitalIdList() {
109   - return hospitalIdList;
110   - }
111   -
112   - public void setHospitalIdList(List<String> hospitalIdList) {
113   - this.hospitalIdList = hospitalIdList;
114   - }
115   -
116   - public boolean isHistory() {
117   - return isHistory;
118   - }
119   -
120   - public void setHistory(boolean history) {
121   - isHistory = history;
122   - }
123   -
124   - public Date getStartCreated() {
125   - return startCreated;
126   - }
127   -
128   - public void setStartCreated(Date startCreated) {
129   - this.startCreated = startCreated;
130   - }
131   -
132   - public Date getEndCreated() {
133   - return endCreated;
134   - }
135   -
136   - public void setEndCreated(Date endCreated) {
137   - this.endCreated = endCreated;
138   - }
139   -
140   - public Integer getQueryTrackType() {
141   - return queryTrackType;
142   - }
143   -
144   - public void setQueryTrackType(Integer queryTrackType) {
145   - this.queryTrackType = queryTrackType;
146   - }
147   -
148   -
149   - public Date getStartBeOverdueDays() {
150   - return startBeOverdueDays;
151   - }
152   -
153   - public void setStartBeOverdueDays(Date startBeOverdueDays) {
154   - this.startBeOverdueDays = startBeOverdueDays;
155   - }
156   -
157   - public Date getEndBeOverdueDays() {
158   - return endBeOverdueDays;
159   - }
160   -
161   - public void setEndBeOverdueDays(Date endBeOverdueDays) {
162   - this.endBeOverdueDays = endBeOverdueDays;
163   - }
164   -
165   - public Date getTrackDownDateStart() {
166   - return trackDownDateStart;
167   - }
168   -
169   - public void setTrackDownDateStart(Date trackDownDateStart) {
170   - this.trackDownDateStart = trackDownDateStart;
171   - }
172   -
173   - public Date getTrackDownDateEnd() {
174   - return trackDownDateEnd;
175   - }
176   -
177   - public void setTrackDownDateEnd(Date trackDownDateEnd) {
178   - this.trackDownDateEnd = trackDownDateEnd;
179   - }
180   -
181   - public Integer getFollowupStatus() {
182   - return followupStatus;
183   - }
184   -
185   - public void setFollowupStatus(Integer followupStatus) {
186   - this.followupStatus = followupStatus;
187   - }
188   -
189   - public Date getAppointmentDateStart() {
190   - return appointmentDateStart;
191   - }
192   -
193   - public void setAppointmentDateStart(Date appointmentDateStart) {
194   - this.appointmentDateStart = appointmentDateStart;
195   - }
196   -
197   - public Date getAppointmentDateEnd() {
198   - return appointmentDateEnd;
199   - }
200   -
201   - public void setAppointmentDateEnd(Date appointmentDateEnd) {
202   - this.appointmentDateEnd = appointmentDateEnd;
203   - }
204   -
205   - public Date getFoundStart() {
206   - return foundStart;
207   - }
208   -
209   - public void setFoundStart(Date foundStart) {
210   - this.foundStart = foundStart;
211   - }
212   -
213   - public Date getFoundEnd() {
214   - return foundEnd;
215   - }
216   -
217   - public void setFoundEnd(Date foundEnd) {
218   - this.foundEnd = foundEnd;
219   - }
220   -
221   - public List<String> getParentIds() {
222   - return parentIds;
223   - }
224   -
225   - public void setParentIds(List<String> parentIds) {
226   - this.parentIds = parentIds;
227   - }
228   -
229   - public String getPhone() {
230   - return phone;
231   - }
232   -
233   - public void setPhone(String phone) {
234   - this.phone = phone;
235   - }
236   -
237   - public String getId() {
238   - return id;
239   - }
240   -
241   - public void setId(String id) {
242   - this.id = id;
243   - }
244   -
245   - public String getCardNo() {
246   - return cardNo;
247   - }
248   -
249   - public void setCardNo(String cardNo) {
250   - this.cardNo = cardNo;
251   - }
252   -
253   - public List getTrackTypes() {
254   - return trackTypes;
255   - }
256   -
257   - public String getSource() {
258   - return source;
259   - }
260   -
261   - public void setSource(String source) {
262   - this.source = source;
263   - }
264   -
265   - public Integer getStatus() {
266   - return status;
267   - }
268   -
269   - public void setStatus(Integer status) {
270   - this.status = status;
271   - }
272   -
273   - public void setTrackTypes(List trackTypes) {
274   - this.trackTypes = trackTypes;
275   - }
276   -
277   - public Date getLastMensesStart() {
278   - return lastMensesStart;
279   - }
280   -
281   - public void setLastMensesStart(Date lastMensesStart) {
282   - this.lastMensesStart = lastMensesStart;
283   - }
284   -
285   - public Date getLastMensesEnd() {
286   - return lastMensesEnd;
287   - }
288   -
289   - public void setLastMensesEnd(Date lastMensesEnd) {
290   - this.lastMensesEnd = lastMensesEnd;
291   - }
292   -
293   - public String getHospitalId() {
294   - return hospitalId;
295   - }
296   -
297   - public void setHospitalId(String hospitalId) {
298   - this.hospitalId = hospitalId;
299   - }
300   -
301   - public String getParentId() {
302   - return parentId;
303   - }
304   -
305   - public void setParentId(String parentId) {
306   - this.parentId = parentId;
307   - }
308   -
309   - public List<String> getPids() {
310   - return pids;
311   - }
312   -
313   - public void setPids(List<String> pids) {
314   - this.pids = pids;
315   - }
316   -
317   - public String getProvinceId() {
318   - return provinceId;
319   - }
320   -
321   - public void setProvinceId(String provinceId) {
322   - this.provinceId = provinceId;
323   - }
324   -
325   - public String getCityId() {
326   - return cityId;
327   - }
328   -
329   - public void setCityId(String cityId) {
330   - this.cityId = cityId;
331   - }
332   -
333   - public String getAreaId() {
334   - return areaId;
335   - }
336   -
337   - public void setAreaId(String areaId) {
338   - this.areaId = areaId;
339   - }
340   -
341   - public String getStreetId() {
342   - return streetId;
343   - }
344   -
345   - public void setStreetId(String streetId) {
346   - this.streetId = streetId;
347   - }
348   -
349   - public String getKey() {
350   - return key;
351   - }
352   -
353   - public void setKey(String key) {
354   - this.key = key;
355   - }
356   -
357   - public Integer getTrackType() {
358   - return trackType;
359   - }
360   -
361   - public String getResidentsArchiveId() {
362   - return residentsArchiveId;
363   - }
364   -
365   - public void setResidentsArchiveId(String residentsArchiveId) {
366   - this.residentsArchiveId = residentsArchiveId;
367   - }
368   -
369   - public void setTrackType(Integer trackType) {
370   - this.trackType = trackType;
371   - }
372   -
373 105 @Override
374 106 public MongoQuery convertToQuery() {
375 107 MongoCondition condition = MongoCondition.newInstance();
376 108  
... ... @@ -587,11 +319,45 @@
587 319 }
588 320 if (null != endBeOverdueDays) {
589 321 if (c1 != null) {
590   - c1 = c1.lte(endBeOverdueDays);
  322 + if (c1.getCriteriaObject().containsField("appointmentDate"))
  323 + {
  324 + c1 = c1.lte(endBeOverdueDays);
  325 + }
  326 + else
  327 + {
  328 + c1 = c1.and("appointmentDate").lte(endBeOverdueDays);
  329 + }
  330 +
591 331 } else {
592 332 c1 = Criteria.where("appointmentDate").lte(endBeOverdueDays);
593 333 }
594 334 }
  335 +
  336 +
  337 + if (null != checkOverDaysStart) {
  338 + if (null != c1) {
  339 + c1 = c1.and("nextCheckTime").gte(checkOverDaysStart);
  340 + } else {
  341 + c1 = Criteria.where("nextCheckTime").gte(checkOverDaysStart);
  342 + }
  343 + }
  344 + if (null != checkOverDaysEnd) {
  345 + if (c1 != null) {
  346 + if (c1.getCriteriaObject().containsField("nextCheckTime"))
  347 + {
  348 + c1 = c1.lte(checkOverDaysEnd);
  349 + }
  350 + else
  351 + {
  352 + c1 = c1.and("nextCheckTime").lte(checkOverDaysEnd);
  353 + }
  354 +
  355 + } else {
  356 + c1 = Criteria.where("nextCheckTime").lte(checkOverDaysEnd);
  357 + }
  358 + }
  359 +
  360 +
595 361 }
596 362 /******产筛特殊处理*******/
597 363 if (null != queryTrackType && queryTrackType == 4) {
... ... @@ -708,6 +474,297 @@
708 474 condition = condition.andCondition(new MongoCondition(c1));
709 475 }
710 476 return condition.toMongoQuery();
  477 + }
  478 +
  479 +
  480 +
  481 + public Date getCheckOverDaysStart() {
  482 + return checkOverDaysStart;
  483 + }
  484 +
  485 + public void setCheckOverDaysStart(Date checkOverDaysStart) {
  486 + this.checkOverDaysStart = checkOverDaysStart;
  487 + }
  488 +
  489 + public Date getCheckOverDaysEnd() {
  490 + return checkOverDaysEnd;
  491 + }
  492 +
  493 + public void setCheckOverDaysEnd(Date checkOverDaysEnd) {
  494 + this.checkOverDaysEnd = checkOverDaysEnd;
  495 + }
  496 +
  497 + public String getTrackHospitalId() {
  498 + return trackHospitalId;
  499 + }
  500 +
  501 + public void setTrackHospitalId(String trackHospitalId) {
  502 + this.trackHospitalId = trackHospitalId;
  503 + }
  504 +
  505 + public List<String> getHospitalIdList() {
  506 + return hospitalIdList;
  507 + }
  508 +
  509 + public void setHospitalIdList(List<String> hospitalIdList) {
  510 + this.hospitalIdList = hospitalIdList;
  511 + }
  512 +
  513 + public boolean isHistory() {
  514 + return isHistory;
  515 + }
  516 +
  517 + public void setHistory(boolean history) {
  518 + isHistory = history;
  519 + }
  520 +
  521 + public Date getStartCreated() {
  522 + return startCreated;
  523 + }
  524 +
  525 + public void setStartCreated(Date startCreated) {
  526 + this.startCreated = startCreated;
  527 + }
  528 +
  529 + public Date getEndCreated() {
  530 + return endCreated;
  531 + }
  532 +
  533 + public void setEndCreated(Date endCreated) {
  534 + this.endCreated = endCreated;
  535 + }
  536 +
  537 + public Integer getQueryTrackType() {
  538 + return queryTrackType;
  539 + }
  540 +
  541 + public void setQueryTrackType(Integer queryTrackType) {
  542 + this.queryTrackType = queryTrackType;
  543 + }
  544 +
  545 +
  546 + public Date getStartBeOverdueDays() {
  547 + return startBeOverdueDays;
  548 + }
  549 +
  550 + public void setStartBeOverdueDays(Date startBeOverdueDays) {
  551 + this.startBeOverdueDays = startBeOverdueDays;
  552 + }
  553 +
  554 + public Date getEndBeOverdueDays() {
  555 + return endBeOverdueDays;
  556 + }
  557 +
  558 + public void setEndBeOverdueDays(Date endBeOverdueDays) {
  559 + this.endBeOverdueDays = endBeOverdueDays;
  560 + }
  561 +
  562 + public Date getTrackDownDateStart() {
  563 + return trackDownDateStart;
  564 + }
  565 +
  566 + public void setTrackDownDateStart(Date trackDownDateStart) {
  567 + this.trackDownDateStart = trackDownDateStart;
  568 + }
  569 +
  570 + public Date getTrackDownDateEnd() {
  571 + return trackDownDateEnd;
  572 + }
  573 +
  574 + public void setTrackDownDateEnd(Date trackDownDateEnd) {
  575 + this.trackDownDateEnd = trackDownDateEnd;
  576 + }
  577 +
  578 + public Integer getFollowupStatus() {
  579 + return followupStatus;
  580 + }
  581 +
  582 + public void setFollowupStatus(Integer followupStatus) {
  583 + this.followupStatus = followupStatus;
  584 + }
  585 +
  586 + public Date getAppointmentDateStart() {
  587 + return appointmentDateStart;
  588 + }
  589 +
  590 + public void setAppointmentDateStart(Date appointmentDateStart) {
  591 + this.appointmentDateStart = appointmentDateStart;
  592 + }
  593 +
  594 + public Date getAppointmentDateEnd() {
  595 + return appointmentDateEnd;
  596 + }
  597 +
  598 + public void setAppointmentDateEnd(Date appointmentDateEnd) {
  599 + this.appointmentDateEnd = appointmentDateEnd;
  600 + }
  601 +
  602 + public Date getFoundStart() {
  603 + return foundStart;
  604 + }
  605 +
  606 + public void setFoundStart(Date foundStart) {
  607 + this.foundStart = foundStart;
  608 + }
  609 +
  610 + public Date getFoundEnd() {
  611 + return foundEnd;
  612 + }
  613 +
  614 + public void setFoundEnd(Date foundEnd) {
  615 + this.foundEnd = foundEnd;
  616 + }
  617 +
  618 + public List<String> getParentIds() {
  619 + return parentIds;
  620 + }
  621 +
  622 + public void setParentIds(List<String> parentIds) {
  623 + this.parentIds = parentIds;
  624 + }
  625 +
  626 + public String getPhone() {
  627 + return phone;
  628 + }
  629 +
  630 + public void setPhone(String phone) {
  631 + this.phone = phone;
  632 + }
  633 +
  634 + public String getId() {
  635 + return id;
  636 + }
  637 +
  638 + public void setId(String id) {
  639 + this.id = id;
  640 + }
  641 +
  642 + public String getCardNo() {
  643 + return cardNo;
  644 + }
  645 +
  646 + public void setCardNo(String cardNo) {
  647 + this.cardNo = cardNo;
  648 + }
  649 +
  650 + public List getTrackTypes() {
  651 + return trackTypes;
  652 + }
  653 +
  654 + public String getSource() {
  655 + return source;
  656 + }
  657 +
  658 + public void setSource(String source) {
  659 + this.source = source;
  660 + }
  661 +
  662 + public Integer getStatus() {
  663 + return status;
  664 + }
  665 +
  666 + public void setStatus(Integer status) {
  667 + this.status = status;
  668 + }
  669 +
  670 + public void setTrackTypes(List trackTypes) {
  671 + this.trackTypes = trackTypes;
  672 + }
  673 +
  674 + public Date getLastMensesStart() {
  675 + return lastMensesStart;
  676 + }
  677 +
  678 + public void setLastMensesStart(Date lastMensesStart) {
  679 + this.lastMensesStart = lastMensesStart;
  680 + }
  681 +
  682 + public Date getLastMensesEnd() {
  683 + return lastMensesEnd;
  684 + }
  685 +
  686 + public void setLastMensesEnd(Date lastMensesEnd) {
  687 + this.lastMensesEnd = lastMensesEnd;
  688 + }
  689 +
  690 + public String getHospitalId() {
  691 + return hospitalId;
  692 + }
  693 +
  694 + public void setHospitalId(String hospitalId) {
  695 + this.hospitalId = hospitalId;
  696 + }
  697 +
  698 + public String getParentId() {
  699 + return parentId;
  700 + }
  701 +
  702 + public void setParentId(String parentId) {
  703 + this.parentId = parentId;
  704 + }
  705 +
  706 + public List<String> getPids() {
  707 + return pids;
  708 + }
  709 +
  710 + public void setPids(List<String> pids) {
  711 + this.pids = pids;
  712 + }
  713 +
  714 + public String getProvinceId() {
  715 + return provinceId;
  716 + }
  717 +
  718 + public void setProvinceId(String provinceId) {
  719 + this.provinceId = provinceId;
  720 + }
  721 +
  722 + public String getCityId() {
  723 + return cityId;
  724 + }
  725 +
  726 + public void setCityId(String cityId) {
  727 + this.cityId = cityId;
  728 + }
  729 +
  730 + public String getAreaId() {
  731 + return areaId;
  732 + }
  733 +
  734 + public void setAreaId(String areaId) {
  735 + this.areaId = areaId;
  736 + }
  737 +
  738 + public String getStreetId() {
  739 + return streetId;
  740 + }
  741 +
  742 + public void setStreetId(String streetId) {
  743 + this.streetId = streetId;
  744 + }
  745 +
  746 + public String getKey() {
  747 + return key;
  748 + }
  749 +
  750 + public void setKey(String key) {
  751 + this.key = key;
  752 + }
  753 +
  754 + public Integer getTrackType() {
  755 + return trackType;
  756 + }
  757 +
  758 + public String getResidentsArchiveId() {
  759 + return residentsArchiveId;
  760 + }
  761 +
  762 + public void setResidentsArchiveId(String residentsArchiveId) {
  763 + this.residentsArchiveId = residentsArchiveId;
  764 + }
  765 +
  766 + public void setTrackType(Integer trackType) {
  767 + this.trackType = trackType;
711 768 }
712 769 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ eb57300
... ... @@ -3431,5 +3431,47 @@
3431 3431 return "setNumberCode finish";
3432 3432 }
3433 3433  
  3434 + @Autowired
  3435 + private TrackDownRecordService trackDownRecordService;
  3436 +
  3437 + /**
  3438 + * 修改最后一次产检预约日期同步到追访记录中
  3439 + * @return
  3440 + */
  3441 + @RequestMapping(value = "/syncTrckDownNextTime", method = RequestMethod.GET)
  3442 + @ResponseBody
  3443 + public String syncTrckDownNextTime() {
  3444 + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
  3445 + downRecordQuery.setStatus(3);
  3446 + List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
  3447 + int batchSize = 1000;
  3448 + int end = 0;
  3449 + for (int i = 0; i < records.size(); i += batchSize) {
  3450 + end = (end + batchSize);
  3451 + if (end > records.size()) {
  3452 + end = records.size();
  3453 + }
  3454 + System.out.println("start:" + i + ",end:" + end);
  3455 + final List<TrackDownRecord> tempList = records.subList(i, end);
  3456 + new Thread(new Runnable() {
  3457 + @Override
  3458 + public void run() {
  3459 + if (CollectionUtils.isNotEmpty(tempList)) {
  3460 + for (TrackDownRecord down : tempList) {
  3461 +
  3462 + Patients pat = patientsService.findOnePatientById(down.getParentId());
  3463 + if (pat != null)
  3464 + {
  3465 + trackDownRecordService.updateTrackDownOneCol(down.getId(), pat.getNextCheckTime());
  3466 + }
  3467 + }
  3468 + }
  3469 + }
  3470 + }).start();
  3471 + }
  3472 +
  3473 + return "syncTrckDownNextTime finish";
  3474 + }
  3475 +
3434 3476 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ eb57300
... ... @@ -1461,10 +1461,19 @@
1461 1461 }
1462 1462 if (StringUtils.isNotEmpty(nextCheckTime)) {
1463 1463 trackDownRecord.setAppointmentDate(DateUtil.parseYMD(nextCheckTime));
  1464 + trackDownRecord.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
1464 1465 } else {
1465 1466 trackDownRecord.setAppointmentDate(new Date());
  1467 +
1466 1468 }
1467 1469 trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
  1470 +
  1471 + //把下次预约时间更新为空
  1472 + if (StringUtils.isEmpty(nextCheckTime) && StringUtils.isNotEmpty(trackDownRecord.getId()))
  1473 + {
  1474 + trackDownRecordService.updateTrackDownOneCol(trackDownRecord.getId(),null);
  1475 + }
  1476 +
1468 1477 }
1469 1478  
1470 1479  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ eb57300
... ... @@ -502,6 +502,34 @@
502 502 downRecordQuery.setCityId(downQueryRequest.getCityId());
503 503 downRecordQuery.setStreetId(downQueryRequest.getStreetId());
504 504 downRecordQuery.setKey(downQueryRequest.getKey());
  505 +
  506 + //产检逾期天数
  507 + AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
  508 + antExRecordQuery.setCheckTimeStart(DateUtil.getMonth(-10)); //当前时间十个月以前的产检数据
  509 + //逾期天数
  510 + if (null != downQueryRequest.getCheckOverDaysStart()) {
  511 + Calendar instance = Calendar.getInstance();
  512 + instance.setTime(new Date());
  513 + instance.add(Calendar.DATE, -downQueryRequest.getCheckOverDaysStart());
  514 + instance.set(Calendar.HOUR_OF_DAY, 23);
  515 + instance.set(Calendar.MINUTE, 59);
  516 + instance.set(Calendar.SECOND, 59);
  517 + instance.set(Calendar.MILLISECOND, 999);
  518 + Date end = instance.getTime();
  519 + downRecordQuery.setCheckOverDaysEnd(end);
  520 + }
  521 + if (null != downQueryRequest.getCheckOverDaysEnd()) {
  522 + Calendar instance = Calendar.getInstance();
  523 + instance.setTime(new Date());
  524 + instance.add(Calendar.DATE, -downQueryRequest.getCheckOverDaysEnd());
  525 + instance.set(Calendar.HOUR_OF_DAY, 00);
  526 + instance.set(Calendar.MINUTE, 00);
  527 + instance.set(Calendar.SECOND, 00);
  528 + instance.set(Calendar.MILLISECOND, 000);
  529 + Date start = instance.getTime();
  530 + downRecordQuery.setCheckOverDaysStart(start);
  531 + }
  532 +
505 533 /**
506 534 *孕期检查
507 535 * */
508 536  
... ... @@ -565,7 +593,32 @@
565 593 downRecordQuery.setStartBeOverdueDays(start);
566 594 }
567 595  
  596 + //逾期天数
  597 + if (null != downQueryRequest.getBeOverdueDaysStart()) {
  598 + Calendar instance = Calendar.getInstance();
  599 + instance.setTime(new Date());
  600 + instance.add(Calendar.DATE, -downQueryRequest.getBeOverdueDaysStart());
  601 + instance.set(Calendar.HOUR_OF_DAY, 23);
  602 + instance.set(Calendar.MINUTE, 59);
  603 + instance.set(Calendar.SECOND, 59);
  604 + instance.set(Calendar.MILLISECOND, 999);
  605 + Date end = instance.getTime();
  606 + downRecordQuery.setEndBeOverdueDays(end);
  607 + }
  608 + if (null != downQueryRequest.getBeOverdueDaysEnd()) {
  609 + Calendar instance = Calendar.getInstance();
  610 + instance.setTime(new Date());
  611 + instance.add(Calendar.DATE, -downQueryRequest.getBeOverdueDaysEnd());
  612 + instance.set(Calendar.HOUR_OF_DAY, 00);
  613 + instance.set(Calendar.MINUTE, 00);
  614 + instance.set(Calendar.SECOND, 00);
  615 + instance.set(Calendar.MILLISECOND, 000);
  616 + Date start = instance.getTime();
  617 + downRecordQuery.setStartBeOverdueDays(start);
  618 + }
568 619  
  620 +
  621 +
569 622 //产检和产后数据特殊处理
570 623 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()) {
571 624 downRecordQuery.setTrackTypes(Arrays.asList(3, 9));
... ... @@ -597,8 +650,6 @@
597 650  
598 651 downRecordQuery.setHospitalId(hospitalId);
599 652  
600   - System.out.println("====>" + downRecordQuery.convertToQuery().convertToMongoQuery());
601   -
602 653 return downRecordQuery;
603 654 }
604 655  
... ... @@ -753,6 +804,7 @@
753 804 PageResult pageResult = new PageResult();
754 805 try {
755 806 downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
  807 + System.out.println(downRecordQuery.convertToQuery().convertToMongoQuery().toString());
756 808 } catch (Exception e) {
757 809 pageResult.setCount(0);
758 810 pageResult.setPage(downQueryRequest.getPage());
... ... @@ -996,7 +1048,6 @@
996 1048 public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate, Integer encryption) {
997 1049  
998 1050 String parentId = downRecord.getParentId();
999   - String hospitalId = downRecord.getHospitalId();
1000 1051 Patients patients = patientsService.findOnePatientById(downRecord.getParentId());
1001 1052  
1002 1053 Map<String, Object> temp = new HashMap<>();
... ... @@ -1051,6 +1102,9 @@
1051 1102 } else {
1052 1103 temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约时间
1053 1104 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间
  1105 +
  1106 + int days = trackDown == null ? 0 : DateUtil.getDays(downRecord.getAppointmentDate(),new Date());
  1107 + temp.put("yyzfTimeDays", days); /** 追访逾期天数 */
1054 1108 }
1055 1109  
1056 1110 } else {
... ... @@ -1062,6 +1116,8 @@
1062 1116 temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 分娩住院预约时间
1063 1117 } else {
1064 1118 temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约预约时间
  1119 + int days = downRecord == null ? 0 : DateUtil.getDays(downRecord.getAppointmentDate(),new Date());
  1120 + temp.put("yyzfTimeDays", days); /** 追访逾期天数 */
1065 1121 }
1066 1122 }
1067 1123 //如果是产前检查取预约结果
... ... @@ -1072,6 +1128,9 @@
1072 1128 //if (downRecord.getTrackType() == TrackDownDateEnums.C.getId() || downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {//产检追访查询预约产检日期
1073 1129 if (examinationModel.getNextCheckTime() != null) {
1074 1130 temp.put("yyTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); /** 预约产检日期 */
  1131 +
  1132 + int days = DateUtil.getDays(examinationModel.getNextCheckTime(), new Date());
  1133 + temp.put("yyTimeDays", days); /** 预约逾期天数 */
1075 1134 }
1076 1135 //}
1077 1136 } else {
1078 1137  
... ... @@ -1082,10 +1141,13 @@
1082 1141 // if (downRecord.getTrackType() == TrackDownDateEnums.C.getId() || downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {//产检追访查询预约产检日期
1083 1142 if (antExChuModel.getNextCheckTime() != null) {
1084 1143 temp.put("yyTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); /** 预约产检日期 */
  1144 + int days = DateUtil.getDays(antExChuModel.getNextCheckTime(), new Date());
  1145 + temp.put("yyTimeDays", days); /** 预约逾期天数 */
1085 1146 }
1086 1147 //}
1087 1148 } else {
1088 1149 temp.put("yyTime", "--");
  1150 + temp.put("yyTimeDays", "--");
1089 1151 }
1090 1152 }
1091 1153  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java View file @ eb57300
... ... @@ -66,6 +66,15 @@
66 66 //起始逾期天数
67 67 private Integer beOverdueDays;
68 68  
  69 +
  70 + //追访预约逾期天数
  71 + private Integer beOverdueDaysStart;
  72 + private Integer beOverdueDaysEnd;
  73 +
  74 + //产检预约逾期天数
  75 + private Integer checkOverDaysStart;
  76 + private Integer checkOverDaysEnd;
  77 +
69 78 //开始追访日期
70 79 private String trackDownDateStart;
71 80  
... ... @@ -91,6 +100,38 @@
91 100 private Integer isRisk;
92 101  
93 102 private boolean isArea;
  103 +
  104 + public Integer getCheckOverDaysStart() {
  105 + return checkOverDaysStart;
  106 + }
  107 +
  108 + public void setCheckOverDaysStart(Integer checkOverDaysStart) {
  109 + this.checkOverDaysStart = checkOverDaysStart;
  110 + }
  111 +
  112 + public Integer getCheckOverDaysEnd() {
  113 + return checkOverDaysEnd;
  114 + }
  115 +
  116 + public void setCheckOverDaysEnd(Integer checkOverDaysEnd) {
  117 + this.checkOverDaysEnd = checkOverDaysEnd;
  118 + }
  119 +
  120 + public Integer getBeOverdueDaysStart() {
  121 + return beOverdueDaysStart;
  122 + }
  123 +
  124 + public void setBeOverdueDaysStart(Integer beOverdueDaysStart) {
  125 + this.beOverdueDaysStart = beOverdueDaysStart;
  126 + }
  127 +
  128 + public Integer getBeOverdueDaysEnd() {
  129 + return beOverdueDaysEnd;
  130 + }
  131 +
  132 + public void setBeOverdueDaysEnd(Integer beOverdueDaysEnd) {
  133 + this.beOverdueDaysEnd = beOverdueDaysEnd;
  134 + }
94 135  
95 136 public boolean isArea() {
96 137 return isArea;