From be7224faf01e0fc0e8f412ea03592a3eee18f184 Mon Sep 17 00:00:00 2001 From: "jesse.wang" Date: Mon, 10 Apr 2023 17:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=AD=95=E5=91=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 6 ++-- .../operate/web/worker/MaterDeliverWorker.java | 36 ++++++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 0174ea8..813c12d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2964,9 +2964,9 @@ public class MatDeliverFacade { } } } - for (ChildbirthManagerQueryModel result : childbirthManagerQueryModelList){ - result.setCreatedWeek(result.getQqybuild()); - } +// for (ChildbirthManagerQueryModel result : childbirthManagerQueryModelList){ +// result.setCreatedWeek(result.getQqybuild()); +// } childbirthManagerResult.setData(childbirthManagerQueryModelList); childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index 4e19e46..88760ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -235,25 +235,41 @@ public class MaterDeliverWorker implements Callable 0 && patients.getBuildType() == 2) { +//// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { +// dueWeek = "已分娩"; +// } else { +// int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); +// if (days > 7 * 42 - 1) { +// dueWeek = "已分娩"; +// } else { +// String week = (days / 7) + ""; +// int day = (days % 7); +// dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); +// } +// } +// } catch (Exception e) { +// // 什么都不干 +// } +// String dueWeek = ""; try { - if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { -// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { + // 徐倩说改的 + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); + if (days > 7 * 42 - 1) { dueWeek = "已分娩"; } else { - int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); - if (days > 7 * 42 - 1) { - dueWeek = "已分娩"; - } else { - String week = (days / 7) + ""; - int day = (days % 7); - dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); - } + String week = (days / 7) + ""; + int day = (days % 7); + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); } + } catch (Exception e) { // 什么都不干 } childbirthManagerQueryModel.setBuildWeek(dueWeek); childbirthManagerQueryModel.setQqybuild(dueWeek); + childbirthManagerQueryModel.setCreatedWeek(dueWeek); // 分娩日期 childbirthManagerQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getFmDate())); -- 1.8.3.1