From 8939072c16ff7dce1444d40e75e5dc2f8b66c9e8 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 10 Oct 2017 16:54:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E5=B7=9E=E5=88=86=E5=A8=A9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/hospitalapi/dzfy/DzfyFmService.java | 23 +++++++++++++++------- .../main/java/com/lyms/hospitalapi/dzfy/Fm.java | 9 +++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java index 955454d..e01a449 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java @@ -176,18 +176,27 @@ public class DzfyFmService { int a = 0;//用来判断是否建了儿童档案,如果建了儿童档案就不保存分娩记录 int count = 0; List users = new ArrayList(); - //String id = fm.getID();//获取所有的孕妇ID,方便孕妇产下双胞胎而用 - //String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " + - // " BABY_DELIVERY_TIME > to_date('"+start+"', 'yyyy-mm-dd hh24:mi:ss') and BABY_DELIVERY_TIME <= to_date('"+end+"', 'yyyy-mm-dd hh24:mi:ss')" + - // " ID='"+id+"'" ; + String id = fm.getID();//获取所有的孕妇ID,方便孕妇产下双胞胎而用 + //用来查询这个孕妇分娩的最近日期的sql + String dateSql = "select max(to_char(BABY_DELIVERY_TIME,'yyyy-mm-dd')) as babyDate from zlhis.v_deliveryinfo where " + + " ID='"+id+"'" ; + //获取到这个孕妇的最近的分娩日期 + List dateList = queryRunner.query(conn, dateSql, new BeanListHandler(Fm.class)); + String startDate = dateList.get(0).getBabyDate()+" 00:00:00"; + String endDate = dateList.get(0).getBabyDate()+" 23:59:59"; + + //查询这个孕妇最近日期所有分娩记录的sql + String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " + + " BABY_DELIVERY_TIME > to_date('"+startDate+"', 'yyyy-mm-dd hh24:mi:ss') and BABY_DELIVERY_TIME <= to_date('"+endDate+"', 'yyyy-mm-dd hh24:mi:ss')" + + " ID='"+id+"'" ; //查出这个ID对应孕妇在这个时间段的分娩记录 - //List allList = queryRunner.query(conn, allSql, new BeanListHandler(Fm.class)); + List allList = queryRunner.query(conn, allSql, new BeanListHandler(Fm.class)); - List allList = new ArrayList(); - allList.add(fm); + //List allList = new ArrayList(); + //allList.add(fm); Date dueDate = null; List babies = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java index 188e181..f1da152 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java @@ -68,6 +68,15 @@ public class Fm { private Date MODIFIED; //修改时间 private Date CREATED; //创建时间 + private String babyDate;//接收孕妇分娩最近日期 + + public String getBabyDate() { + return babyDate; + } + + public void setBabyDate(String babyDate) { + this.babyDate = babyDate; + } public String getID() { -- 1.8.3.1