Commit f316e57b40441683732b363a5a22f8e42c970e81
1 parent
3bd30c3923
Exists in
master
and in
8 other branches
update code
Showing 2 changed files with 39 additions and 3 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
View file @
f316e57
| ... | ... | @@ -216,6 +216,16 @@ |
| 216 | 216 | //丈夫文化程度Id |
| 217 | 217 | private String hlevelTypeId; |
| 218 | 218 | |
| 219 | + //体验类型 | |
| 220 | + private Integer expType; | |
| 221 | + | |
| 222 | + public Integer getExpType() { | |
| 223 | + return expType; | |
| 224 | + } | |
| 225 | + | |
| 226 | + public void setExpType(Integer expType) { | |
| 227 | + this.expType = expType; | |
| 228 | + } | |
| 219 | 229 | |
| 220 | 230 | public String getPlevelTypeId() { |
| 221 | 231 | return plevelTypeId; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
f316e57
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.biz.service.BasicConfigService; |
| 4 | -import com.lyms.platform.common.enums.ServiceStatusEnums; | |
| 5 | -import com.lyms.platform.common.enums.ServiceTypeEnums; | |
| 6 | -import com.lyms.platform.common.enums.YnEnums; | |
| 4 | +import com.lyms.platform.common.enums.*; | |
| 7 | 5 | import com.lyms.platform.common.result.BaseListResponse; |
| 8 | 6 | import com.lyms.platform.common.utils.StringUtils; |
| 9 | 7 | import com.lyms.platform.common.utils.SystemConfig; |
| ... | ... | @@ -188,6 +186,10 @@ |
| 188 | 186 | List serviceStatus = ServiceStatusEnums.getServiceStatusList(); |
| 189 | 187 | typeMap.put("serviceStatus", serviceStatus); |
| 190 | 188 | |
| 189 | + //孕妇体验类型 | |
| 190 | + List expYunEnums = ExpYunEnums.getExpYunEnums(); | |
| 191 | + typeMap.put("expYunEnums", expYunEnums); | |
| 192 | + | |
| 191 | 193 | list.add(typeMap); |
| 192 | 194 | |
| 193 | 195 | |
| ... | ... | @@ -273,6 +275,28 @@ |
| 273 | 275 | patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId()); |
| 274 | 276 | |
| 275 | 277 | patient.setServiceStatus(yunRequest.getServiceStatus()); |
| 278 | + | |
| 279 | + if (yunRequest.getExpType() != null) | |
| 280 | + { | |
| 281 | + if (yunRequest.getExpType() == ExpYunEnums.SGY.getId()) | |
| 282 | + { | |
| 283 | + Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(yunRequest.getBookbuildingDate()),3); | |
| 284 | + Date dueDate = DateUtil.parseYMD(yunRequest.getDueDate()); | |
| 285 | + if (vipEndTime.getTime() > dueDate.getTime()) | |
| 286 | + { | |
| 287 | + vipEndTime = dueDate; | |
| 288 | + } | |
| 289 | + patient.setVipEndTime(vipEndTime); | |
| 290 | + } | |
| 291 | + else | |
| 292 | + { | |
| 293 | + Date vipEndTime = DateUtil.parseYMD(yunRequest.getDueDate()); | |
| 294 | + patient.setVipEndTime(vipEndTime); | |
| 295 | + } | |
| 296 | + patient.setExpType(yunRequest.getExpType()); | |
| 297 | + } | |
| 298 | + | |
| 299 | + | |
| 276 | 300 | patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime())); |
| 277 | 301 | patient.setExpVip(yunRequest.getExpVip()); |
| 278 | 302 | patient.setMremark(yunRequest.getMremark()); |
| ... | ... | @@ -286,6 +310,8 @@ |
| 286 | 310 | patient.setVcCardNo(yunRequest.getVcCardNo()); |
| 287 | 311 | patient.setHospitalId(yunRequest.getHospitalId()); |
| 288 | 312 | patient.setYn(YnEnums.YES.getId()); |
| 313 | + | |
| 314 | + | |
| 289 | 315 | |
| 290 | 316 | patient.setBuildType(0); |
| 291 | 317 |