fangcheng / regional-platform

Download as
Browse Code »

Commit f3dee266108a86305c86c876959e08d2f23e167f

Authored by jiangjiazhi
1 parent 83ae525c38
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 1 changed file with 6 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ f3dee26
... ... @@ -563,10 +563,12 @@
563 563 List listData = new ArrayList();
564 564 Organization organization = null;
565 565 PatientsQuery patientsQuery1 = new PatientsQuery();
566   - patientsQuery1.setBookbuildingDateEnd(end);
  566 +// patientsQuery1.setBookbuildingDateEnd(end);
  567 + patientsQuery1.setLastMensesEnd(end);
567 568 patientsQuery1.setBuildType(1);
568 569 if (listDate.size() > i + 1) {
569   - patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000));
  570 +// patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000));
  571 + patientsQuery1.setLastMensesStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000));
570 572 }
571 573 pid = list.get(0).getPid();
572 574 patientsQuery1.setPid(pid);
573 575  
574 576  
575 577  
... ... @@ -636,15 +638,9 @@
636 638 postReviewQuery.setPid(pid);
637 639 Object obj = map.get(listDate.get(i).getId());
638 640 if (obj instanceof MaternalDeliverModel) {
639   - MaternalDeliverModel model = (MaternalDeliverModel) obj;
640   - if(model.getYn() == YnEnums.YES.getId()){
641 641 listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
642   - }
643 642 } else if (obj instanceof StopPregModel) {
644   - StopPregModel model=(StopPregModel)obj;
645   - if(model.getYn() == YnEnums.YES.getId()) {
646 643 listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
647   - }
648 644 }
649 645  
650 646 //产后复查记录
... ... @@ -669,7 +665,8 @@
669 665 PatientsQuery patientsQuery1 = new PatientsQuery();
670 666 patientsQuery1.setYn(YnEnums.YES.getId());
671 667 patientsQuery1.setPid(pid);
672   - patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(0).getDate().getTime()));
  668 +// patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(0).getDate().getTime()));
  669 + patientsQuery1.setLastMensesStart(new Date(listDate.get(0).getDate().getTime()));
673 670 patientsQuery1.setType(1);
674 671 patientsQuery1.setBuildType(1);
675 672 List<Patients> patientsList = patientsService.queryPatient(patientsQuery1);