From bf3e565d25297aae3c6a19f05667c957bacb5875 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 10 Jul 2024 09:51:49 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E4=BA=A7=E5=90=8E?= =?UTF-8?q?=E5=BA=B7=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=BC=80=E9=80=9A=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ViewController.java | 4 ++-- .../operate/web/facade/PatientServiceFacade.java | 28 ++++++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 40ec964..faa11e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -149,8 +149,8 @@ public class ViewController extends BaseController { public BaseObjectResponse AntExChuSyncXtlc(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("parentId") String parentId) { - System.out.println("------------------------------------------------------"); - System.out.println("---startDate----"+startDate +"------endDate----"+endDate+"------parentId----"+parentId ); + //System.out.println("------------------------------------------------------"); + // System.out.println("---startDate----"+startDate +"------endDate----"+endDate+"------parentId----"+parentId ); BaseObjectResponse br = antenatalExaminationFacade.AntExChuFuZSyncXtlc(startDate, endDate, parentId); return br; } 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 c2b2a40..9713a11 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 @@ -685,14 +685,14 @@ public class PatientServiceFacade { Integer doctorService = pser.getDoctorWeek(); if (serviceWeek != null) { - Date endTime = DateUtil.addWeek(currentDate, serviceWeek); - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { - endTime = DateUtil.addWeek(lastMenses, 42); + if (pser.getPerType()==1){ + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { + endTime = DateUtil.addWeek(lastMenses, 42); + } } Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + serviceWeek; endWeek = endWeek > 42 ? 42 : endWeek; - pser.setSerStartTime(currentDate); pser.setSerEndTime(endTime); pser.setSerStartWeek(DateUtil.getWeek(lastMenses, currentDate)); @@ -700,10 +700,13 @@ public class PatientServiceFacade { } if (doctorService != null) { Date endTime = DateUtil.addWeek(currentDate, doctorService); - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { - endTime = DateUtil.addWeek(lastMenses, 42); + if (pser.getPerType()==1){ + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { + endTime = DateUtil.addWeek(lastMenses, 42); + } } + Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + doctorService; endWeek = endWeek > 42 ? 42 : endWeek; @@ -726,10 +729,13 @@ public class PatientServiceFacade { Date startTime = pser.getSerStartTime(); Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek); - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { - endTime = DateUtil.addWeek(lastMenses, 42); + if (pser.getPerType()==1){ + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { + endTime = DateUtil.addWeek(lastMenses, 42); + } } + Integer startWeek = DateUtil.getWeek(lastMenses, startTime); Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek; endWeek = endWeek > 42 ? 42 : endWeek; @@ -750,8 +756,10 @@ public class PatientServiceFacade { if (doctorWeek != null && doctorWeek > 0) { if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime()) { Date endTime = DateUtil.addWeek(pser.getDocEndTime(), doctorWeek); - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { - endTime = DateUtil.addWeek(lastMenses, 42); + if (pser.getPerType()==1){ + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { + endTime = DateUtil.addWeek(lastMenses, 42); + } } Date startTime = pser.getSerStartTime(); -- 1.8.3.1