From f2893e8be83c2cb964290c74badd8166515429c6 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 9 Jun 2022 17:17:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E5=A6=87=E5=B9=BC-=E5=BB=BA=E6=A1=A3=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E7=BB=9F=E8=AE=A1=EF=BC=9A=E6=B5=B7=E6=B8=AF=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E5=8C=97=E6=88=B4=E6=B2=B3=E5=8C=BA=E3=80=81=E5=B1=B1?= =?UTF-8?q?=E6=B5=B7=E5=85=B3=E5=8C=BA=20=E8=BE=96=E5=8C=BA=E4=B8=8B?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8C=BB=E9=99=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/CouponMapper.java | 5 ++ .../permission/model/BookbuildingCouponQuery.java | 76 ++++++++++++++++++++++ .../main/resources/mainOrm/master/CouponMapper.xml | 58 +++++++++++++++++ .../operate/web/controller/ReportController.java | 14 ++++ .../operate/web/service/IReportService.java | 3 + .../web/service/impl/ReportServiceImpl.java | 73 +++++++++++++++++++-- .../src/main/resources/log4j_config.xml | 1 + 7 files changed, 226 insertions(+), 4 deletions(-) create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index 879ea6b..42228d0 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -1,5 +1,6 @@ package com.lyms.platform.permission.dao.master; +import com.lyms.platform.permission.model.BookbuildingCouponQuery; import com.lyms.platform.permission.model.CouponInfo; import java.util.List; @@ -162,4 +163,8 @@ public interface CouponMapper { List findUsedInfo2ids(Map param); List findCouponInfoCount2Ids(Map param); + + List bookbuildingCoupon(BookbuildingCouponQuery query); + + int bookbuildingCouponCount(BookbuildingCouponQuery query); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java new file mode 100644 index 0000000..99f7334 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java @@ -0,0 +1,76 @@ +package com.lyms.platform.permission.model; + + +import com.lyms.platform.common.dao.BaseQuery; + +import java.util.List; + +/** + * 建档优惠券统计 查询参数 + */ +public class BookbuildingCouponQuery extends BaseQuery { + + private String startDate; + private String endDate; + private String name; + private String cardNo; + private String areaId; + private String hospitalId; + private List personIds; + + public List getPersonIds() { + return personIds; + } + + public void setPersonIds(List personIds) { + this.personIds = personIds; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } +} \ No newline at end of file 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 269dcf3..39a27ba 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -1429,6 +1429,64 @@ and h.hospital_id = #{hid} and p.type='2')) temp + + + + + + 1 = 1 + + AND DATE_FORMAT( c.create_date, '%Y-%m-%d' ) >= date_format(#{startDate},'%Y-%m-%d') + AND + + + AND o.area_id=#{areaId} + + + AND c.create_hospital_id=#{hospitalId} + + + and c.user_id in + + #{item} + + + + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index 2e86241..f83fbb4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.IReportService; import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.permission.model.BookbuildingCouponQuery; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -679,4 +680,17 @@ public class ReportController extends BaseController { @RequestParam(required = true)Date endDate) { return reportService.getAreaFinallyOverdue(hospitalId,areaId,startDate,endDate); } + + /** + * 秦皇岛 海港区、北戴河区、山海关区 辖区下所有医院 + * 建档优惠券统计 + * @param bookbuildingCouponQuery + * @return + */ + @RequestMapping(value = "/bookbuildingCoupon", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse bookbuildingCoupon(BookbuildingCouponQuery bookbuildingCouponQuery) { + return reportService.bookbuildingCoupon(bookbuildingCouponQuery); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java index b78c29c..8a45095 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.permission.model.BookbuildingCouponQuery; import javax.servlet.http.HttpServletResponse; import java.util.Date; @@ -132,4 +133,6 @@ public interface IReportService extends IBaseService { BaseResponse getFinallyCheckOverdue(String hospitalId, Date startDate, Date endDate); BaseResponse getAreaFinallyOverdue(String hospitalId,String areaId ,Date startDate, Date endDate); + + BaseObjectResponse bookbuildingCoupon(BookbuildingCouponQuery bookbuildingCouponQuery); } 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 434cb0b..a5736e3 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 @@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject; import com.lyms.hospitalapi.pojo.ReportModel; import com.lyms.platform.biz.AntExChuModelTemp; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.*; import com.lyms.platform.common.utils.*; @@ -19,15 +21,13 @@ import com.lyms.platform.operate.web.utils.*; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.worker.AntExRecordWorker; import com.lyms.platform.permission.dao.master.CouponMapper; +import com.lyms.platform.permission.model.BookbuildingCouponQuery; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.AntExChuQuery; -import com.lyms.platform.query.AntExRecordQuery; -import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.SieveApplyOrderQuery; +import com.lyms.platform.query.*; import com.lymsh.platform.reportdata.model.echarts.Series; import org.apache.commons.collections.*; import org.apache.commons.collections.map.HashedMap; @@ -112,6 +112,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Autowired private PatientsService patientsService; + @Autowired + private PersonService personService; private static final Map colorMap = new HashMap<>(); @@ -5397,4 +5399,67 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService br.setObject(mapList); return br; } + + @Override + public BaseObjectResponse bookbuildingCoupon(BookbuildingCouponQuery query) { + BaseObjectResponse objectResponse = new BaseObjectResponse(); + List personList=new ArrayList<>(); + if(StringUtils.isNotEmpty(query.getName()) || StringUtils.isNotEmpty(query.getCardNo())){ + PersonModelQuery personModelQuery = new PersonModelQuery(); + personModelQuery.setYn(YnEnums.YES.getId()); + if (StringUtils.isNotEmpty(query.getName())) { + personModelQuery.setName(query.getName()); + } + if (StringUtils.isNotEmpty(query.getCardNo())) { + personModelQuery.setCardNo(query.getCardNo()); + } + personList = personService.queryPersons(personModelQuery); + //没查到 + if(CollectionUtils.isEmpty(personList)){ + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + } + List personIds=new ArrayList<>(); + for (PersonModel personModel : personList) { + if (StringUtils.isNotEmpty(personModel.getId())) { + personIds.add(personModel.getId()); + } + } + //查询姓名身份证结果放入mysql查询 + if(CollectionUtils.isNotEmpty(personIds)){ + query.setPersonIds(personIds); + } + //查询mysql 优惠券记录 + List bookbuildingCouponList=couponMapper.bookbuildingCoupon(query); + //分页总数 + int count = couponMapper.bookbuildingCouponCount(query); + List result=new ArrayList<>(); + for (Map bookbuildingCoupon : bookbuildingCouponList) { + Map map=new HashedMap(); + PersonModel personModel = mongoTemplate.findById(bookbuildingCoupon.get("userid").toString(), PersonModel.class); + if(null!=personModel){ + map.put("name", personModel.getName()); + map.put("phone", personModel.getPhone()); + map.put("cardNo", personModel.getCardNo()); + map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); + map.put("created", bookbuildingCoupon.get("created")); + }else { + //处理分页计数 + if(0!=count){ + count--; + } + } + result.add(map); + } + //分页数据 + query.mysqlBuild(count); + + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + objectResponse.setData(result); + objectResponse.setPageInfo(query.getPageInfo()); + return objectResponse; + } } diff --git a/platform-operate-api/src/main/resources/log4j_config.xml b/platform-operate-api/src/main/resources/log4j_config.xml index ef00bce..f9c87b1 100644 --- a/platform-operate-api/src/main/resources/log4j_config.xml +++ b/platform-operate-api/src/main/resources/log4j_config.xml @@ -122,6 +122,7 @@ + -- 1.8.3.1