diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 2ac764b..e443089 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -306,13 +306,13 @@ public class PatientServiceFacade { babyBookbuildingAddRequest.setId(ps.getParentid()); if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == ps.getSerType().intValue()) { babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { + if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { + } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.td.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { + } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.gq.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { + } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); } } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == ps.getSerType().intValue()) { @@ -323,13 +323,13 @@ public class PatientServiceFacade { //是否有增值服务--没有则处理标准服务 if (count == 0) { babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { + if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { + } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.td.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { + } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.gq.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { + } else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index ad46975..7296dc7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -118,13 +118,13 @@ public class PatientServiceSysFacade implements SysBaseFacade { babyBookbuildingAddRequest.setId(patientService.getParentid()); if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == patientService.getSerType().intValue()) { babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - if (patientService.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { + if (patientService.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - } else if (patientService.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { + } else if (patientService.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.td.getId().intValue()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); - } else if (patientService.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { + } else if (patientService.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.gq.getId().intValue()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); - } else if (patientService.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { + } else if (patientService.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId().intValue()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); } babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest);