From 110056ca2c63448879a8f131f592c2245a0abcd0 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 13 Jul 2017 18:52:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0status=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mainOrm/master/CouponMapper.xml | 5 ++++- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index 83b3e82..b0b3cbe 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -244,6 +244,7 @@ from organization a, coupon_info b, coupon_template c, coupon_type d where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id and a.id = #{hid} + and b.status = 2 and d.type in #{type} @@ -261,6 +262,7 @@ from organization a, coupon_info b, coupon_template c, coupon_type d where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id and a.id = #{hid} + and b.status = 2 and d.type in #{type} @@ -337,6 +339,7 @@ select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_id from coupon_info a, coupon_template b, coupon_type c, organization d where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id + and a.status = 2 and a.used_hospital_id in #{hid} @@ -363,7 +366,7 @@ select count(1) from ( select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_id from coupon_info a, coupon_template b, coupon_type c, organization d - where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id + where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id and a.status = 2 and a.used_hospital_id in #{hid} 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 0ba97e7..4fd67ae 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 @@ -1256,7 +1256,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService tempMap.put("HIGH_RISK_GRADE", mongoUtil.findName(examinationModel.getRiskScore())); tempMap.put("HIGH_RISK_FACTOR", mongoUtil.findName(examinationModel.getRiskFactor())); // tempMap.put("EDD_DATE", examinationModel.); - tempMap.put("LAST_EXAMINE_DATE", examinationModel.getLastMenses()); + tempMap.put("LAST_EXAMINE_DATE", DateUtil.getyyyy_MM_dd(examinationModel.getLastMenses())); String prodDoctor = examinationModel.getCheckDoctor(); if(StringUtils.isNotBlank(prodDoctor)) { Users users = usersService.getUsers(Integer.parseInt(prodDoctor)); @@ -1269,7 +1269,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService tempMap.put("HIGH_RISK_GRADE", mongoUtil.findName(antExChuModel.getHighriskSocre())); /** 高危等级 */ tempMap.put("HIGH_RISK_FACTOR", mongoUtil.findName(antExChuModel.getHighrisk())); /** 风险因素 */ tempMap.put("EDD_DATE", antExChuModel.getDueDate()); - tempMap.put("LAST_EXAMINE_DATE", antExChuModel.getCheckTime()); + tempMap.put("LAST_EXAMINE_DATE", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); String prodDoctor = antExChuModel.getProdDoctor(); if(StringUtils.isNotBlank(prodDoctor)) { Users users = usersService.getUsers(Integer.parseInt(prodDoctor)); -- 1.8.3.1