shiyang / regional-platform

Download as
Browse Code »

Commit 90c5ab009a0c9cc81b467d031d616528226ed85f

Authored by jiangjiazhi
1 parent 127b751ffb
Exists in master and in 1 other branch nobuildprocess

增加设置parentid

Showing 2 changed files with 5 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 90c5ab0
... ... @@ -435,8 +435,8 @@
435 435 //初诊记录
436 436 AntExChuQuery antExChuQuery = new AntExChuQuery();
437 437 antExChuQuery.setYn(YnEnums.YES.getId());
438   - antExChuQuery.setStart(patients.getBookbuildingDate());
439   - antExChuQuery.setEnd(new Date(date.getTime() + 86398000));
  438 +// antExChuQuery.setStart(patients.getBookbuildingDate());
  439 +// antExChuQuery.setEnd(new Date(date.getTime() + 86398000));
440 440 antExChuQuery.setParentId(patients.getId());
441 441 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
442 442 if (CollectionUtils.isNotEmpty(antExChuModels)) {
... ... @@ -452,8 +452,8 @@
452 452 AntExQuery antExQuery = new AntExQuery();
453 453 antExQuery.setYn(YnEnums.YES.getId());
454 454 antExQuery.setParentId(patients.getId());
455   - antExQuery.setStart(patients.getBookbuildingDate());
456   - antExQuery.setEnd(new Date(date.getTime() + 86398000));
  455 +// antExQuery.setStart(patients.getBookbuildingDate());
  456 +// antExQuery.setEnd(new Date(date.getTime() + 86398000));
457 457 List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
458 458 if (CollectionUtils.isNotEmpty(list1)) {
459 459 for (AntenatalExaminationModel an : list1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java View file @ 90c5ab0
... ... @@ -78,7 +78,7 @@
78 78  
79 79 public AntData(Patients model,String hospitalName) {
80 80 this.id = model.getId();
81   - int days = DateUtil.daysBetween(model.getLastMenses(), model.getCreated());
  81 + int days = DateUtil.daysBetween(model.getLastMenses(), model.getBookbuildingDate());
82 82 this.dueWeek = StringUtils.dueWeek(days);
83 83 this.checkTime = DateUtil.getyyyy_MM_dd(model.getBookbuildingDate());
84 84 this.title="孕妇建档";