Commit 5981c68e44c2c09378a6b35ddc9d3231ca74214e
1 parent
333660e4a7
Exists in
master
and in
6 other branches
服务同步
Showing 1 changed file with 6 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
5981c68
| ... | ... | @@ -249,7 +249,7 @@ |
| 249 | 249 | operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务"); |
| 250 | 250 | |
| 251 | 251 | if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童建档服务数据处理 |
| 252 | - if (PatientSerEnums.SerTypeEnums.babyjzzz.getId() == Integer.parseInt(serInfo.get("serType"))) { | |
| 252 | + if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { | |
| 253 | 253 | BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); |
| 254 | 254 | babyBookbuildingAddRequest.setId(ps.getParentid()); |
| 255 | 255 | babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); |
| ... | ... | @@ -304,7 +304,7 @@ |
| 304 | 304 | if (before.getPerType() != null && before.getPerType() == 2) {//儿童建档服务数据处理 |
| 305 | 305 | BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); |
| 306 | 306 | babyBookbuildingAddRequest.setId(ps.getParentid()); |
| 307 | - if (PatientSerEnums.SerTypeEnums.babyjzzz.getId() == ps.getSerType()) { | |
| 307 | + if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == ps.getSerType().intValue()) { | |
| 308 | 308 | babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); |
| 309 | 309 | if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { |
| 310 | 310 | babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); |
| ... | ... | @@ -315,7 +315,7 @@ |
| 315 | 315 | } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { |
| 316 | 316 | babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); |
| 317 | 317 | } |
| 318 | - } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId() == ps.getSerType()) { | |
| 318 | + } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == ps.getSerType().intValue()) { | |
| 319 | 319 | PatientServiceQuery query = new PatientServiceQuery(); |
| 320 | 320 | query.setParentid(after.getParentid()); |
| 321 | 321 | query.setSerType(PatientSerEnums.SerTypeEnums.babyjzzz.getId()); |
| ... | ... | @@ -337,7 +337,7 @@ |
| 337 | 337 | babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); |
| 338 | 338 | } else {//孕妇建档服务数据处理 |
| 339 | 339 | YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); |
| 340 | - if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {//孕期精准指导同步到建档 | |
| 340 | + if (PatientSerEnums.SerTypeEnums.yqjzzd.getId().intValue() == ps.getSerType().intValue()) {//孕期精准指导同步到建档 | |
| 341 | 341 | yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); |
| 342 | 342 | if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { |
| 343 | 343 | yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); |
| ... | ... | @@ -348,7 +348,7 @@ |
| 348 | 348 | } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { |
| 349 | 349 | yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); |
| 350 | 350 | } |
| 351 | - }else if(PatientSerEnums.SerTypeEnums.bzfw.getId() == ps.getSerType()){ | |
| 351 | + }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()){ | |
| 352 | 352 | PatientServiceQuery query = new PatientServiceQuery(); |
| 353 | 353 | query.setParentid(after.getParentid()); |
| 354 | 354 | query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); |
| ... | ... | @@ -356,7 +356,7 @@ |
| 356 | 356 | //是否有增值服务--没有则处理标准服务 |
| 357 | 357 | if (count == 0) { |
| 358 | 358 | yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); |
| 359 | - if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { | |
| 359 | + if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) { | |
| 360 | 360 | yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); |
| 361 | 361 | } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { |
| 362 | 362 | yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); |