jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 79271db67b79c3e35ca9ade4fe12e9ef6885b146

Authored by liquanyu
1 parent f5b5077fc1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

服务

Showing 1 changed file with 58 additions and 35 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 79271db
... ... @@ -310,7 +310,18 @@
310 310 //服务开通操作人
311 311 pser.setUpdateUser(String.valueOf(userId));
312 312  
313   -
  313 + if (serInfo.containsKey("device")) {
  314 + pser.setDevice(Integer.parseInt(serInfo.get("device")));
  315 + }
  316 + if (serInfo.containsKey("deviceCon")) {
  317 + pser.setDevice(Integer.parseInt(serInfo.get("deviceCon")));
  318 + }
  319 + if (serInfo.containsKey("doctorWeek")) {
  320 + pser.setDevice(Integer.parseInt(serInfo.get("doctorWeek")));
  321 + }
  322 + if (serInfo.containsKey("serviceWeek")) {
  323 + pser.setDevice(Integer.parseInt(serInfo.get("serviceWeek")));
  324 + }
314 325 Patients patients = patientsService.findOnePatientById(ps.getParentid());
315 326 setServiceRecordAdd(pser, patients);
316 327  
317 328  
318 329  
... ... @@ -378,16 +389,20 @@
378 389 Integer serviceWeek = pser.getServiceWeek();
379 390 Integer doctorService = pser.getDoctorWeek();
380 391  
  392 + if (serviceWeek != null)
  393 + {
381 394 pser.setSerStartTime(new Date());
382 395 pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek));
383 396 pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date()));
384 397 pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek);
385   -
  398 + }
  399 + if (doctorService != null)
  400 + {
386 401 pser.setDocStartTime(new Date());
387 402 pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek));
388 403 pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date()));
389 404 pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService);
390   -
  405 + }
391 406 }
392 407  
393 408  
394 409  
395 410  
396 411  
397 412  
398 413  
399 414  
400 415  
401 416  
402 417  
403 418  
... ... @@ -398,48 +413,56 @@
398 413 Integer doctorService = pser.getDoctorWeek();
399 414 if (pser.getId() != null)
400 415 {
401   - if (pser.getSerEndTime().getTime() > new Date().getTime())
  416 + if (serviceWeek != null)
402 417 {
  418 + if (pser.getSerEndTime().getTime() > new Date().getTime())
  419 + {
403 420  
404   - Date startTime = pser.getSerStartTime();
405   - Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek);
  421 + Date startTime = pser.getSerStartTime();
  422 + Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek);
406 423  
407   - pser.setSerStartTime(startTime);
408   - pser.setSerEndTime(endTime);
  424 + pser.setSerStartTime(startTime);
  425 + pser.setSerEndTime(endTime);
409 426  
410   - Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
411   - Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek;
412   - pser.setSerStartWeek(startWeek);
413   - pser.setSerEndWeek(endWeek);
  427 + Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
  428 + Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek;
  429 + pser.setSerStartWeek(startWeek);
  430 + pser.setSerEndWeek(endWeek);
  431 + }
  432 + else
  433 + {
  434 + pser.setSerStartTime(new Date());
  435 + pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek));
  436 + pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date()));
  437 + pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek);
  438 + }
414 439 }
415   - else
416   - {
417   - pser.setSerStartTime(new Date());
418   - pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek));
419   - pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date()));
420   - pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek);
421   - }
422 440  
423   - if (pser.getDocEndTime().getTime() > new Date().getTime())
  441 + if (doctorService != null)
424 442 {
425   - Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorService);
426   - Date startTime = pser.getSerStartTime();
  443 + if (pser.getDocEndTime().getTime() > new Date().getTime())
  444 + {
  445 + Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorService);
  446 + Date startTime = pser.getSerStartTime();
427 447  
428   - pser.setDocEndTime(endTime);
429   - pser.setDocStartTime(startTime);
  448 + pser.setDocEndTime(endTime);
  449 + pser.setDocStartTime(startTime);
430 450  
431   - Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
432   - Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService;
433   - pser.setDocStartWeek(startWeek);
434   - pser.setDocEndWeek(endWeek);
  451 + Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
  452 + Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService;
  453 + pser.setDocStartWeek(startWeek);
  454 + pser.setDocEndWeek(endWeek);
  455 + }
  456 + else
  457 + {
  458 + pser.setDocStartTime(new Date());
  459 + pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek));
  460 + pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date()));
  461 + pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService);
  462 + }
435 463 }
436   - else
437   - {
438   - pser.setDocStartTime(new Date());
439   - pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek));
440   - pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date()));
441   - pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService);
442   - }
  464 +
  465 +
443 466 }
444 467  
445 468 }