jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 110056ca2c63448879a8f131f592c2245a0abcd0

Authored by litao@lymsh.com
1 parent 812ce91019
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

优惠券统计增加status限制

Showing 2 changed files with 6 additions and 3 deletions

platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ 110056c
... ... @@ -244,6 +244,7 @@
244 244 from organization a, coupon_info b, coupon_template c, coupon_type d
245 245 where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
246 246 and a.id = #{hid}
  247 + and b.status = 2
247 248 and d.type in
248 249 <foreach collection="couponType" open="(" close=")" separator="," item="type">
249 250 #{type}
... ... @@ -261,6 +262,7 @@
261 262 from organization a, coupon_info b, coupon_template c, coupon_type d
262 263 where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
263 264 and a.id = #{hid}
  265 + and b.status = 2
264 266 and d.type in
265 267 <foreach collection="couponType" open="(" close=")" separator="," item="type">
266 268 #{type}
... ... @@ -337,6 +339,7 @@
337 339 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
338 340 from coupon_info a, coupon_template b, coupon_type c, organization d
339 341 where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id
  342 + and a.status = 2
340 343 and a.used_hospital_id in
341 344 <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
342 345 #{hid}
... ... @@ -363,7 +366,7 @@
363 366 select count(1) from (
364 367 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
365 368 from coupon_info a, coupon_template b, coupon_type c, organization d
366   - where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id
  369 + where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id and a.status = 2
367 370 and a.used_hospital_id in
368 371 <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
369 372 #{hid}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 110056c
... ... @@ -1256,7 +1256,7 @@
1256 1256 tempMap.put("HIGH_RISK_GRADE", mongoUtil.findName(examinationModel.getRiskScore()));
1257 1257 tempMap.put("HIGH_RISK_FACTOR", mongoUtil.findName(examinationModel.getRiskFactor()));
1258 1258 // tempMap.put("EDD_DATE", examinationModel.);
1259   - tempMap.put("LAST_EXAMINE_DATE", examinationModel.getLastMenses());
  1259 + tempMap.put("LAST_EXAMINE_DATE", DateUtil.getyyyy_MM_dd(examinationModel.getLastMenses()));
1260 1260 String prodDoctor = examinationModel.getCheckDoctor();
1261 1261 if(StringUtils.isNotBlank(prodDoctor)) {
1262 1262 Users users = usersService.getUsers(Integer.parseInt(prodDoctor));
... ... @@ -1269,7 +1269,7 @@
1269 1269 tempMap.put("HIGH_RISK_GRADE", mongoUtil.findName(antExChuModel.getHighriskSocre())); /** 高危等级 */
1270 1270 tempMap.put("HIGH_RISK_FACTOR", mongoUtil.findName(antExChuModel.getHighrisk())); /** 风险因素 */
1271 1271 tempMap.put("EDD_DATE", antExChuModel.getDueDate());
1272   - tempMap.put("LAST_EXAMINE_DATE", antExChuModel.getCheckTime());
  1272 + tempMap.put("LAST_EXAMINE_DATE", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
1273 1273 String prodDoctor = antExChuModel.getProdDoctor();
1274 1274 if(StringUtils.isNotBlank(prodDoctor)) {
1275 1275 Users users = usersService.getUsers(Integer.parseInt(prodDoctor));