diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java index 185e524..7f58028 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java @@ -15,13 +15,13 @@ public class RespBuilder { return buildSuccess(null); } - public static BaseObjectResponse buildSuccess(Object ... data) { + public static BaseObjectResponse buildSuccess(Object... data) { BaseObjectResponse resp = new BaseObjectResponse(); - if(data != null) { + if (data != null) { Assert.isTrue(data.length == 1 || data.length % 2 == 0, "length必须为偶数"); - if(data.length == 1) { + if (data.length == 1) { resp.setData(data[0]); } else { resp.setData(createMap(data)); @@ -40,7 +40,7 @@ public class RespBuilder { public static BaseObjectResponse buildErro(ResponseCode code, Object data) { BaseObjectResponse resp = new BaseObjectResponse(); resp.setData(data); - if(code != null) { + if (code != null) { resp.setErrorcode(code.getCode()); resp.setErrormsg(code.getMsg()); } else { @@ -50,12 +50,12 @@ public class RespBuilder { return resp; } - public static Map createMap(Object ... args){ - Map map = new HashMap<>(); + public static Map createMap(Object... args) { + Map map = new HashMap<>(); for (int i = 0; i < args.length; i++) { String key = args[i++].toString(); Object value = args[i]; - if(value != null) { + if (value != null) { map.put(key, value); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java index 36874c4..4a2ecdd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java @@ -795,7 +795,7 @@ public class annualReportFacade { babyModelQuery6.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1)); } babyModelQuery6.setBabyWeightStart("0"); - babyModelQuery6.setBabyWeightEnd("2.6"); + babyModelQuery6.setBabyWeightEnd("2.49"); int lowWeightCount = babyService.queryBabyCount(babyModelQuery6); //低出生体重数 @@ -870,6 +870,7 @@ public class annualReportFacade { matDeliverQuery10.setFmHospitalList(entry.getValue()); int babySiChanCount = 0; int babySiTaiCount = 0; + int babyJinRuanTaiCount = 0; List babySiWangList = matDeliverService.query(matDeliverQuery10); if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(babySiWangList)) { for (MaternalDeliverModel model : babySiWangList) { @@ -880,13 +881,15 @@ public class annualReportFacade { babySiChanCount++; } else if (baby.getPregnancyOut() != null && "1".equals(baby.getPregnancyOut())) { babySiTaiCount++; + } else if (baby.getPregnancyOut() != null && "2".equals(baby.getPregnancyOut())) { + babyJinRuanTaiCount++; } } } } } babySiWangList.clear(); - map.put("babySiChanSiTaiCount", String.valueOf(babySiChanCount + babySiTaiCount)); + map.put("babySiChanSiTaiCount", String.valueOf(babySiChanCount + babySiTaiCount + babyJinRuanTaiCount)); patientCountSum += patientCount; babyCountSum += babyCount; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java index dc6535e..789ed88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java @@ -147,11 +147,17 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe Criteria criteria = new Criteria(); criteria = criteria.orOperator(Criteria.where("name").is(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key)); List patients = mongoTemplate.find(Query.query(criteria), PersonModel.class); - for (PersonModel patients1 : patients) { - keys.add(patients1.getId()); + if (CollectionUtils.isNotEmpty(patients)) { + for (PersonModel patients1 : patients) { + keys.add(patients1.getId()); + } + } else { + return RespBuilder.buildSuccess(null); } + } param.put("keys", keys); + Integer type = 4; String coupon = (String) param.get("couponType"); /** 选中单个优惠券类型查询时 前端传的是 type_order 目前传入这种的只有使用统计 */ if (StringUtils.isNotEmpty(coupon)) {