Commit 4e73cab79d7adb955313b8c76fd0c83c17c8eee3
1 parent
f68797b6ce
Exists in
master
and in
6 other branches
服务同步
Showing 2 changed files with 46 additions and 30 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
4e73cab
| ... | ... | @@ -319,7 +319,7 @@ |
| 319 | 319 | * @return |
| 320 | 320 | */ |
| 321 | 321 | public boolean updateBabySerInfo(BabyBookbuildingAddRequest request){ |
| 322 | - if(StringUtils.isEmpty(request.getId())){ | |
| 322 | + if(StringUtils.isEmpty(request.getId())||request.getServiceType()==null||request.getServiceStatus()==null){ | |
| 323 | 323 | return false; |
| 324 | 324 | } |
| 325 | 325 | BabyModelQuery babyQuery = new BabyModelQuery(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
4e73cab
| ... | ... | @@ -242,7 +242,7 @@ |
| 242 | 242 | operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务"); |
| 243 | 243 | |
| 244 | 244 | if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童建档服务数据处理 |
| 245 | - if(PatientSerEnums.SerTypeEnums.babyjzzz.getId() == ps.getSerType()){ | |
| 245 | + if (PatientSerEnums.SerTypeEnums.babyjzzz.getId() == ps.getSerType()) { | |
| 246 | 246 | BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); |
| 247 | 247 | babyBookbuildingAddRequest.setId(ps.getParentid()); |
| 248 | 248 | babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); |
| 249 | 249 | |
| ... | ... | @@ -292,10 +292,12 @@ |
| 292 | 292 | |
| 293 | 293 | patientServiceService.updatePatientService(ps); |
| 294 | 294 | |
| 295 | + PatientService after = patientServiceService.getPatientService(ps.getId()); | |
| 296 | + | |
| 295 | 297 | if (before.getPerType() != null && before.getPerType() == 2) {//儿童建档服务数据处理 |
| 296 | 298 | BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); |
| 297 | 299 | babyBookbuildingAddRequest.setId(ps.getParentid()); |
| 298 | - if(PatientSerEnums.SerTypeEnums.babyjzzz.getId() == ps.getSerType()){ | |
| 300 | + if (PatientSerEnums.SerTypeEnums.babyjzzz.getId() == ps.getSerType()) { | |
| 299 | 301 | babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); |
| 300 | 302 | if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { |
| 301 | 303 | babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); |
| ... | ... | @@ -306,16 +308,23 @@ |
| 306 | 308 | } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { |
| 307 | 309 | babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); |
| 308 | 310 | } |
| 309 | - }else if(PatientSerEnums.SerTypeEnums.babyBzfw.getId() == ps.getSerType()){ | |
| 310 | - babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); | |
| 311 | - if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { | |
| 312 | - babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); | |
| 313 | - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { | |
| 314 | - babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); | |
| 315 | - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { | |
| 316 | - babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); | |
| 317 | - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { | |
| 318 | - babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); | |
| 311 | + } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId() == ps.getSerType()) { | |
| 312 | + PatientServiceQuery query = new PatientServiceQuery(); | |
| 313 | + query.setParentid(after.getParentid()); | |
| 314 | + query.setSerType(PatientSerEnums.SerTypeEnums.babyjzzz.getId()); | |
| 315 | + int count = patientServiceService.queryPatientServiceCount(query); | |
| 316 | + //是否有增值服务--没有则处理标准服务 | |
| 317 | + if (count == 0) { | |
| 318 | + babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); | |
| 319 | + if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { | |
| 320 | + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); | |
| 321 | + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { | |
| 322 | + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); | |
| 323 | + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { | |
| 324 | + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); | |
| 325 | + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { | |
| 326 | + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); | |
| 327 | + } | |
| 319 | 328 | } |
| 320 | 329 | } |
| 321 | 330 | babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); |
| 322 | 331 | |
| ... | ... | @@ -333,20 +342,27 @@ |
| 333 | 342 | yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); |
| 334 | 343 | } |
| 335 | 344 | }else if(PatientSerEnums.SerTypeEnums.bzfw.getId() == ps.getSerType()){ |
| 336 | - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); | |
| 337 | - if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { | |
| 338 | - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); | |
| 339 | - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { | |
| 340 | - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); | |
| 341 | - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { | |
| 342 | - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); | |
| 343 | - } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { | |
| 344 | - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); | |
| 345 | + PatientServiceQuery query = new PatientServiceQuery(); | |
| 346 | + query.setParentid(after.getParentid()); | |
| 347 | + query.setSerType(PatientSerEnums.SerTypeEnums.babyjzzz.getId()); | |
| 348 | + int count = patientServiceService.queryPatientServiceCount(query); | |
| 349 | + //是否有增值服务--没有则处理标准服务 | |
| 350 | + if (count == 0) { | |
| 351 | + yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); | |
| 352 | + if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { | |
| 353 | + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); | |
| 354 | + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { | |
| 355 | + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); | |
| 356 | + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { | |
| 357 | + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); | |
| 358 | + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { | |
| 359 | + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); | |
| 360 | + } | |
| 345 | 361 | } |
| 346 | 362 | } |
| 347 | 363 | bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); |
| 348 | 364 | } |
| 349 | - PatientService after = patientServiceService.getPatientService(ps.getId()); | |
| 365 | + | |
| 350 | 366 | operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, after, OptActionEnums.UPDATE.getId(), "修改服务"); |
| 351 | 367 | BaseResponse baseResponse = new BaseResponse(); |
| 352 | 368 | baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 353 | 369 | |
| ... | ... | @@ -366,14 +382,14 @@ |
| 366 | 382 | } |
| 367 | 383 | PatientSerResult result = new PatientSerResult(); |
| 368 | 384 | result.setId(ps.getId()); |
| 369 | - if(ps.getPerType()!=null&&ps.getPerType()==2){//儿童 | |
| 385 | + if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童 | |
| 370 | 386 | BabyModel model = babyService.getOneBabyById(ps.getParentid()); |
| 371 | 387 | result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); |
| 372 | 388 | result.setBabyName(StringUtils.emptyDeal(model.getName())); |
| 373 | 389 | result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); |
| 374 | 390 | result.setName(StringUtils.emptyDeal(model.getMname())); |
| 375 | 391 | result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); |
| 376 | - }else { | |
| 392 | + } else { | |
| 377 | 393 | Patients patients = patientsService.findOnePatientById(ps.getParentid()); |
| 378 | 394 | if (null != patients) { |
| 379 | 395 | String weekDesc = DateUtil.getWeekDesc(patients.getLastMenses(), new Date()); |
| 380 | 396 | |
| ... | ... | @@ -402,12 +418,12 @@ |
| 402 | 418 | } |
| 403 | 419 | if (StringUtils.isNotEmpty(ps.getUpdateUser())) { |
| 404 | 420 | try { |
| 405 | - if(StringUtils.isNum(ps.getUpdateUser())) { | |
| 421 | + if (StringUtils.isNum(ps.getUpdateUser())) { | |
| 406 | 422 | Users users = usersService.getUsers(Integer.parseInt(ps.getUpdateUser())); |
| 407 | 423 | if (users != null) { |
| 408 | 424 | result.setUpdateUser(users.getName()); |
| 409 | 425 | } |
| 410 | - }else{ | |
| 426 | + } else { | |
| 411 | 427 | result.setUpdateUser("产检医生"); |
| 412 | 428 | } |
| 413 | 429 | } catch (Exception e) { |
| ... | ... | @@ -473,7 +489,7 @@ |
| 473 | 489 | * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停) |
| 474 | 490 | * @return |
| 475 | 491 | */ |
| 476 | - public BaseListResponse getPatientService(Integer serType,Integer perType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) { | |
| 492 | + public BaseListResponse getPatientService(Integer serType, Integer perType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) { | |
| 477 | 493 | //根据用户id获取医院ID |
| 478 | 494 | String hospitalId = autoMatchFacade.getHospitalId(id); |
| 479 | 495 | PatientServiceQuery patientQuery = new PatientServiceQuery(); |
| 480 | 496 | |
| ... | ... | @@ -481,9 +497,9 @@ |
| 481 | 497 | patientQuery.setSerType(serType); |
| 482 | 498 | patientQuery.setSerDoct(serDoct); |
| 483 | 499 | //服务类型 |
| 484 | - if(perType==null){ | |
| 500 | + if (perType == null) { | |
| 485 | 501 | patientQuery.setPerType(1); |
| 486 | - }else{ | |
| 502 | + } else { | |
| 487 | 503 | patientQuery.setPerType(perType); |
| 488 | 504 | } |
| 489 | 505 | patientQuery.setCreateStartDate(createStartDate); |