Commit 68107759d06af0fa65daa02933ac615543c48351
1 parent
d6e144661f
Exists in
master
and in
6 other branches
优惠券报表
Showing 2 changed files with 2 additions and 2 deletions
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
View file @
6810775
| ... | ... | @@ -223,7 +223,7 @@ |
| 223 | 223 | </select> |
| 224 | 224 | |
| 225 | 225 | <select id="findCouponInfo" parameterType="map" resultType="map"> |
| 226 | - select c.type, a.sequence_id, d.name, e.name as send_hospital | |
| 226 | + select c.type, a.sequence_id, d.name, e.name as send_hospital, a.use_date | |
| 227 | 227 | from coupon_info a, coupon_template b, coupon_type c, users d, organization e, hospital_coupon_template_group f |
| 228 | 228 | where a.coupon_template_id = b.id and b.type_id = c.id and a.user_id = d.id and a.status=2 and a.create_hospital_id = e.id |
| 229 | 229 | and a.used_hospital_id = #{hospitalId} and f.hospital_id = a.used_hospital_id and c.type in |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
6810775
| ... | ... | @@ -511,7 +511,7 @@ |
| 511 | 511 | if(patients != null) { |
| 512 | 512 | map.put("username", patients.getUsername()); /** 姓名 */ |
| 513 | 513 | } |
| 514 | - map.put("week", DateUtil.getDays(antexc.getCheckTime(), antexc.getLastMenses()));/** 产检孕周 = 产检时间 - 末次月经 */ | |
| 514 | + map.put("week", DateUtil.getWeek(antexc.getLastMenses(), antexc.getCheckTime()));/** 产检孕周 = 产检时间 - 末次月经 */ | |
| 515 | 515 | map.put("number", antexc.getProdTime()); /** 产检第几次 */ |
| 516 | 516 | map.put("doctorName", couponMapper.findUserName(antexc.getProdDoctor())); /** 产检医生 */ |
| 517 | 517 | map.put("operatorOrgName", couponMapper.findUserName(antexc.getOperator() + "")); /** 产检机构 */ |