From ee02b739d25b25af7915de07cf7ab790a2595221 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 13 Jan 2017 11:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/AntExRecordService.java | 6 +-- .../java/com/lyms/platform/operate/web/Test.java | 48 ++++++---------------- .../operate/web/facade/AntExRecordFacade.java | 6 +-- .../operate/web/result/CjStatisticsListResult.java | 2 +- 4 files changed, 20 insertions(+), 42 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index 867a07c..0edad80 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -45,7 +45,7 @@ public class AntExRecordService { private IAntExRecordMDao iAntExRecordMDao; public List aggregateOne(AntExRecordQuery antExRecordQuery) { - return iAntExRecordMDao.aggregateOne(antExRecordQuery.convertToQuery()); + return antExRecordDao.aggregateOne(antExRecordQuery.convertToQuery()); } public Integer countM(AntExRecordQuery antExRecordQuery){ @@ -78,7 +78,7 @@ public class AntExRecordService { if (null == count || 0 == count) { antExRecordDao.addOneRecord(record); } - antExRecordQuery.setfId(null); + /*antExRecordQuery.setfId(null); count = iAntExRecordMDao.count(antExRecordQuery.convertToQuery()); if (null == count || 0 == count) { AntExPRecordModel pRecordModel=new AntExPRecordModel(); @@ -92,7 +92,7 @@ public class AntExRecordService { }catch (Exception e){ } iAntExRecordMDao.addOneRecord(pRecordModel); - } + }*/ } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 348279f..ed2124e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -8,9 +8,13 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.BabyCheckModelQuery; +import com.lyms.platform.query.PatientCheckTicketQuery; import com.lyms.platform.query.PatientsQuery; +import org.apache.commons.lang.math.*; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.data.mongodb.core.aggregation.Aggregation; +import org.springframework.data.mongodb.core.aggregation.AggregationOperation; import org.springframework.data.mongodb.core.query.Update; import java.util.ArrayList; @@ -24,7 +28,7 @@ import java.util.List; public class Test { public static void main(String[] args) { -// PatientsQuery patientsQuery1 = new PatientsQuery(); + PatientsQuery patientsQuery1 = new PatientsQuery(); // patientsQuery1.setHospitalId("221"); // patientsQuery1.setYn(YnEnums.YES.getId()); // patientsQuery1.setType(1); @@ -211,39 +215,13 @@ public class Test { } */ - - - BabyCheckModelQuery babyQuery = new BabyCheckModelQuery(); - babyQuery.setHospitalId("216"); - - babyQuery.setYn(YnEnums.YES.getId()); - Date currentDate = DateUtil.formatDate(new Date()); - -// String birth="2016-02-01 - 2016-05-01"; - Integer monthAgeStart = 1; - Integer monthAgeEnd = 1; - -// if (StringUtils.isNotEmpty(birth)) -// { -// String birthStr = birth; -// String[] dates = birthStr.split(" - "); -// babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); -// babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1])); -// } - if (monthAgeStart != null) - { - Date start = DateUtil.addMonth(currentDate, -monthAgeStart); - babyQuery.setCheckDateEnd(start); - } - if (monthAgeEnd != null) - { - Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthAgeEnd - 1), 1); - babyQuery.setCheckDateStart(end); - } - - - System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); - - + PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery(); + patientCheckTicketQuery.setStatus(1); + patientCheckTicketQuery.setCreatedStart(DateUtil.parseYMD("2016-05-10")); + patientCheckTicketQuery.setCreatedEnd(DateUtil.parseYMD("2017-01-10")); + patientCheckTicketQuery.setPid("58747fd60cf297bacef6db8f"); + String s ="1.0"; + + System.out.print((int)Double.parseDouble(s)); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index c46483e..3250757 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -331,9 +331,9 @@ public class AntExRecordFacade { } if (statisticsQueryRequest.getType() == 1) { - List list2 = recordService.queryAntExRecords1(antExRecordQuery); + List list2 = recordService.queryAntExRecords(antExRecordQuery); if (CollectionUtils.isNotEmpty(list2)) { - for (AntExPRecordModel record : list2) { + for (AntExRecordModel record : list2) { CjStatisticsListResult cjStatisticsListResult = new CjStatisticsListResult(); cjStatisticsListResult.convertToResult(record); Patients patients = patientsService.findOnePatientById(record.getParentId()); @@ -406,7 +406,7 @@ public class AntExRecordFacade { for (HashMap map : list) { CjStatisticsResult cjStatisticsResult = new CjStatisticsResult(); String dId = null; - Object id = map.get("_id"); + Object id = map.get("checkDoctor"); if (null != id) { dId = id.toString(); } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CjStatisticsListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CjStatisticsListResult.java index 1a0faca..cd71536 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CjStatisticsListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CjStatisticsListResult.java @@ -49,7 +49,7 @@ public class CjStatisticsListResult { setType(record.getType()); return this; } - public CjStatisticsListResult convertToResult(AntExPRecordModel record) { + public CjStatisticsListResult convertToResult(AntExRecordModel record) { setDueDate(DateUtil.getyyyy_MM_dd(record.getDueDate())); if(null!=record.getLastMenses()){ int days= DateUtil.daysBetween(record.getLastMenses(),new Date()); -- 1.8.3.1