diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CouponEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CouponEnums.java new file mode 100644 index 0000000..3809744 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CouponEnums.java @@ -0,0 +1,41 @@ +package com.lyms.platform.common.enums; + +/** + * @Author: litao + * @Date: 2017/4/19 + * @Version: V1.0 + */ +public enum CouponEnums { + + PRENATAL(1, "产检券"), + ANTENATAL(2, "产前券"), + POSTPARTUM(3, "产后券"), + REVIEW(4, "复查券"), + CHILD_HEALTH(5, "儿保券"); + + private Integer code; + private String name; + + CouponEnums(Integer code, String name) { + this.code = code; + this.name = name; + } + + public static CouponEnums get(Integer code) { + CouponEnums[] values = CouponEnums.values(); + for (CouponEnums value : values) { + if (value.getCode() == code) { + return value; + } + } + return null; + } + + public Integer getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCheckTicket.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCheckTicket.java index 656d828..43692b0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCheckTicket.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCheckTicket.java @@ -1,6 +1,7 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.enums.CouponEnums; import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; @@ -22,6 +23,7 @@ public class PatientCheckTicket extends BaseModel { private Integer status; // 1：创建未使用， 2：产检使用，3：分娩销毁 4:建档删除 删除 private Date created; private Date consumeDate; + private CouponEnums coupon; // 优惠券类型 public String getPid() { return pid; @@ -86,4 +88,12 @@ public class PatientCheckTicket extends BaseModel { public void setConsumeDate(Date consumeDate) { this.consumeDate = consumeDate; } + + public CouponEnums getCoupon() { + return coupon; + } + + public void setCoupon(CouponEnums coupon) { + this.coupon = coupon; + } } diff --git a/platform-operate-api/pom.xml b/platform-operate-api/pom.xml index 6be4135..09cc644 100644 --- a/platform-operate-api/pom.xml +++ b/platform-operate-api/pom.xml @@ -119,6 +119,19 @@ + + + + org.eclipse.jetty + jetty-maven-plugin + 9.3.8.v20160314 + + + / + + + + platform-operate-api diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 64b6932..1fd4381 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -4,6 +4,7 @@ import com.lyms.hospitalapi.qhdfy.QhdfyFmService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.platform.biz.JdbcUtil; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.enums.CouponEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.CompressEncodeingUtil; import com.lyms.platform.common.utils.DateUtil; @@ -16,10 +17,6 @@ import com.lyms.platform.operate.web.service.SyncDataTaskService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; -import com.lyms.platform.query.AntExChuQuery; -import com.lyms.platform.query.AntExQuery; -import com.lyms.platform.query.MatDeliverQuery; -import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -1036,4 +1033,19 @@ public class TestController { return genIdService.poll("1234"); } + /** + * 初始化优惠券的类型 全部设置位产检券 + * @return + */ + @RequestMapping("/init/ticket") + @ResponseBody + public String initTicket() { + List tickets = mongoTemplate.findAll(PatientCheckTicket.class); + for (PatientCheckTicket ticket : tickets) { + ticket.setCoupon(CouponEnums.PRENATAL); + mongoTemplate.save(ticket); + } + return "1"; + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index c64c498..8b3e469 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1,8 +1,8 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.fnfy.FnfyHisService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; -import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; import com.lyms.platform.biz.service.*; @@ -13,10 +13,8 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; -import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.JdbcUtil; import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.model.Organization; @@ -27,7 +25,6 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -472,7 +469,7 @@ public class BookbuildingFacade { } if (null != areaCode&&StringUtils.isNotEmpty(areaCode.getAreaCode())) { // 建档成功后，给孕妇造五个条形码 - String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode()); +// String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode()); int start = TicketTypeEnums.TICKTE_ALL.getType().equals(groupsItems.getTicketType()) ?1:PatientCheckTicketFacade.complyCurrentDay(p.getLastMenses()); for (Integer i =start; i <= 5; i++) { @@ -484,6 +481,7 @@ public class BookbuildingFacade { // ticket.setId(areaCode.getAreaCode() + ticketPid + i); ticket.setId(genSequenceIdService.poll(areaCode.getAreaCode())); ticket.setPid(p.getPid()); + ticket.setCoupon(CouponEnums.PRENATAL); patientCheckTicketService.addTicket(ticket); } }