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 a53b1e5..73cdcd6 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 @@ -157,7 +157,7 @@ public class DzfyFmService { //Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); - Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeLocalConnection(); + Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); QueryRunner queryRunner = new QueryRunner(); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { @@ -180,13 +180,17 @@ public class DzfyFmService { 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 " + + String dateSql = "select max(to_char(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mi:ss')) 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"; + Calendar calendar = Calendar.getInstance(); + calendar.setTime(fmt.parse(dateList.get(0).getBabyDate())); + calendar.add(Calendar.DAY_OF_MONTH, -1); + Date sDate = calendar.getTime(); + String startDate = fmt.format(sDate); + String endDate = dateList.get(0).getBabyDate(); //查询这个孕妇最近日期所有分娩记录的sql String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " +