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 93ec2c6..4dce112 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 @@ -278,7 +278,7 @@ public class AntExRecordService { } else { antExRecordModel.setStatus(1); } - antExRecordModel.setcDay(DateUtil.daysBetween(patients.getLastMenses(),antExChuModel.getCheckTime())); + antExRecordModel.setcDay(DateUtil.daysBetween(patients.getLastMenses(), antExChuModel.getCheckTime())); //户籍地和居住地2个是相反的 antExRecordModel.setAddressRegister(patients.getAddress()); @@ -325,12 +325,23 @@ public class AntExRecordService { * @return */ public List queryAntExRecords(AntExRecordQuery antExRecordQuery) { +// MongoQuery query = antExRecordQuery.convertToQuery(); +// if (StringUtils.isNotEmpty(antExRecordQuery.getNeed())) { +// antExRecordQuery.mysqlBuild(antExRecordDao.count(query)); +// query.start(antExRecordQuery.getOffset()).end(antExRecordQuery.getLimit()); +// } +// return antExRecordDao.queryRecord(query.addOrder(Sort.Direction.DESC, "checkTime")); + + return queryAntExRecords(antExRecordQuery,Sort.Direction.DESC,"checkTime"); + } + + public List queryAntExRecords(AntExRecordQuery antExRecordQuery,Sort.Direction direction,String sortField) { MongoQuery query = antExRecordQuery.convertToQuery(); if (StringUtils.isNotEmpty(antExRecordQuery.getNeed())) { antExRecordQuery.mysqlBuild(antExRecordDao.count(query)); query.start(antExRecordQuery.getOffset()).end(antExRecordQuery.getLimit()); } - return antExRecordDao.queryRecord(query.addOrder(Sort.Direction.DESC, "checkTime")); + return antExRecordDao.queryRecord(query.addOrder(direction, sortField)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index f9ed3ee..bcdc495 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -27,6 +27,7 @@ import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.domain.Sort; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; @@ -579,22 +580,22 @@ public class AreaCountFacade { } else if (nodeName == 1) { - antExRecordQuery.setcDueWeekStart(16); + antExRecordQuery.setcDueWeekStart(16*7); antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); } else if (nodeName == 2) { - antExRecordQuery.setcDueWeekStart(21); + antExRecordQuery.setcDueWeekStart(21*7); antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); } else if (nodeName == 3) { - antExRecordQuery.setcDueWeekStart(28); + antExRecordQuery.setcDueWeekStart(28*7); antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); } else if (nodeName == 4) { - antExRecordQuery.setcDueWeekStart(37); + antExRecordQuery.setcDueWeekStart(37*7); antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); } } @@ -609,9 +610,29 @@ public class AreaCountFacade { { Map map = new HashMap<>(); map.put("EXAMINE_DATE", DateUtil.getyyyy_MM_dd(model.getCheckTime())); //产检日期 - map.put("NAME",model.getName()); //姓名 + map.put("NAME", model.getName()); //姓名 map.put("YZ_NAME", StringUtils.dueWeek(model.getcDay())); //产检孕周 - map.put("EXAMINE_HISTORY_NUM",""); //产检第次 + + AntExRecordQuery query = new AntExRecordQuery(); + query.setParentId(model.getParentId()); + + String times = ""; + List antExRecordModels = recordService.queryAntExRecords(antExRecordQuery,Sort.Direction.ASC,"checkTime"); + if (CollectionUtils.isNotEmpty(antExRecordModels)) + { + for (int j = 0 ; j < list.size() ; j++) + { + AntExRecordModel antExRecordModel = list.get(j); + + if (model.getId().equals(antExRecordModel.getId())) + { + times = String.valueOf(j); + break; + } + } + } + + map.put("EXAMINE_HISTORY_NUM",times); //产检第次 String chospital = "";