From 7676a6b39ec1957c4181c600f78747dbdb394e3f Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Mon, 13 Nov 2017 16:23:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/ReportServiceImpl.java | 61 ++++++++++++++++++---- 1 file changed, 52 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index f50ce7b..844da70 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -569,7 +569,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse unUsedInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId) { - List hospitalIds = new ArrayList<>(); + BaseObjectResponse baseObjectResponse = unUsed(startDate, endDate, provinceId, cityId, areaId, hospitalId, page, limit, userId); + PageResult pageResult = (PageResult) baseObjectResponse.getData(); + List> datas = (List>) pageResult.getGrid(); + for (Map data : datas) { + if(hospitalId.equals(data.get("hospitalId").toString())) { + List> unUsedCoupons = (List>) data.get("un_used_coupons"); + return RespBuilder.buildSuccess(new PageResult(unUsedCoupons.size(), page, limit, CollectionUtils.getPageIds(unUsedCoupons, page, limit))); + } + } + + /*List hospitalIds = new ArrayList<>(); hospitalIds.add(hospitalId); List> datas = couponMapper.findHospitalInfoByIds(hospitalIds); List patients = getPatients(hospitalIds, datas, startDate, endDate, provinceId, cityId, areaId, true); @@ -601,7 +611,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } Integer count = couponMapper.findUnUsedInfoCount(CollectionUtils.createMap("userIds", userIds, "hospitalId", hospitalId)); return RespBuilder.buildSuccess(new PageResult(count, page, limit, restList)); - } + }*/ return RespBuilder.buildSuccess(new PageResult(0, page, limit, null)); } @@ -690,6 +700,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1)); } List patients = mongoTemplate.find(Query.query(c).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); + for (Patients patient : patients) { + System.out.println(patient); + } List userIds = new ArrayList<>(); List> patientInfos = new ArrayList<>(); @@ -803,7 +816,37 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse unUsedPeopleInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId) { - List hospitalIds = Arrays.asList(hospitalId); + BaseObjectResponse baseObjectResponse = unUsed(startDate, endDate, provinceId, cityId, areaId, hospitalId, page, limit, userId); + PageResult pageResult = (PageResult) baseObjectResponse.getData(); + List> datas = (List>) pageResult.getGrid(); + for (Map map : datas) { + if(hospitalId.equals(map.get("hospitalId").toString())) { + List patientIds = (List) map.get("unUsedIds"); + List> restList = new ArrayList<>(); + for (String patientId : patientIds) { + Patients pt = mongoTemplate.findById(patientId, Patients.class); + if(pt != null) { + Map temp = new HashMap<>(); + temp.put("username", pt.getUsername()); + temp.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(pt.getPhone())); + temp.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(pt.getCardNo())); + String residenceAddress = findName(pt.getProvinceRegisterId()) + findName(pt.getCityRegisterId()) + findName(pt.getAreaRegisterId()) + findName(pt.getStreetRegisterId()) + pt.getAddressRegister(); + temp.put("residenceAddress", residenceAddress.replace("null", "")); /** 居住地 */ + String householdAddress = findName(pt.getProvinceId()) + findName(pt.getCityId()) + findName(pt.getAreaId()) + findName(pt.getStreetId()) + pt.getAddress(); + temp.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */ + temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); /** 当前孕周 */ + temp.put("buildWeek", DateUtil.getWeekDesc(pt.getBookbuildingDate(), new Date())); /** 建档孕周 */ + temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */ + temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor())); + temp.put("hospitalName", couponMapper.findHospitalNameById(pt.getHospitalId())); + restList.add(temp); + } + } + return RespBuilder.buildSuccess(new PageResult(patientIds.size(), page, limit, CollectionUtils.getPageIds(restList, page, limit))); + } + } + + /* List hospitalIds = Arrays.asList(hospitalId); List> datas = couponMapper.findHospitalInfoByIds(hospitalIds); List patients = getPatients(hospitalIds, datas, startDate, endDate, provinceId, cityId, areaId, true); if(CollectionUtils.isNotEmpty(patients)) { @@ -827,12 +870,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService temp.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(pt.getPhone())); temp.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(pt.getCardNo())); String residenceAddress = findName(pt.getProvinceRegisterId()) + findName(pt.getCityRegisterId()) + findName(pt.getAreaRegisterId()) + findName(pt.getStreetRegisterId()) + pt.getAddressRegister(); - temp.put("residenceAddress", residenceAddress.replace("null", "")); /** 居住地 */ + temp.put("residenceAddress", residenceAddress.replace("null", "")); *//** 居住地 *//* String householdAddress = findName(pt.getProvinceId()) + findName(pt.getCityId()) + findName(pt.getAreaId()) + findName(pt.getStreetId()) + pt.getAddress(); - temp.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */ - temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); /** 当前孕周 */ - temp.put("buildWeek", DateUtil.getWeekDesc(pt.getBookbuildingDate(), new Date())); /** 建档孕周 */ - temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */ + temp.put("householdAddress", householdAddress.replace("null", "")); *//** 户籍地 *//* + temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); *//** 当前孕周 *//* + temp.put("buildWeek", DateUtil.getWeekDesc(pt.getBookbuildingDate(), new Date())); *//** 建档孕周 *//* + temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); *//** 建档日期 *//* temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor())); temp.put("hospitalName", couponMapper.findHospitalNameById(pt.getHospitalId())); restList.add(temp); @@ -840,7 +883,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } return RespBuilder.buildSuccess(new PageResult(count, page, limit, restList)); } - } + }*/ return RespBuilder.buildSuccess(new PageResult(0, page, limit, null)); } -- 1.8.3.1