diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 0e2791e..e095e0e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -216,6 +216,16 @@ public class Patients extends BaseModel { //丈夫文化程度Id private String hlevelTypeId; + //体验类型 + private Integer expType; + + public Integer getExpType() { + return expType; + } + + public void setExpType(Integer expType) { + this.expType = expType; + } public String getPlevelTypeId() { return plevelTypeId; 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 6bb084a..079adb9 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,9 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.common.enums.ServiceStatusEnums; -import com.lyms.platform.common.enums.ServiceTypeEnums; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; @@ -188,6 +186,10 @@ public class BookbuildingFacade { List serviceStatus = ServiceStatusEnums.getServiceStatusList(); typeMap.put("serviceStatus", serviceStatus); + //孕妇体验类型 + List expYunEnums = ExpYunEnums.getExpYunEnums(); + typeMap.put("expYunEnums", expYunEnums); + list.add(typeMap); @@ -273,6 +275,28 @@ public class BookbuildingFacade { patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId()); patient.setServiceStatus(yunRequest.getServiceStatus()); + + if (yunRequest.getExpType() != null) + { + if (yunRequest.getExpType() == ExpYunEnums.SGY.getId()) + { + Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(yunRequest.getBookbuildingDate()),3); + Date dueDate = DateUtil.parseYMD(yunRequest.getDueDate()); + if (vipEndTime.getTime() > dueDate.getTime()) + { + vipEndTime = dueDate; + } + patient.setVipEndTime(vipEndTime); + } + else + { + Date vipEndTime = DateUtil.parseYMD(yunRequest.getDueDate()); + patient.setVipEndTime(vipEndTime); + } + patient.setExpType(yunRequest.getExpType()); + } + + patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime())); patient.setExpVip(yunRequest.getExpVip()); patient.setMremark(yunRequest.getMremark()); @@ -287,6 +311,8 @@ public class BookbuildingFacade { patient.setHospitalId(yunRequest.getHospitalId()); patient.setYn(YnEnums.YES.getId()); + + patient.setBuildType(0); patient.setDueStatus(0);