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 29da42c..84dc514 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 @@ -65,7 +65,7 @@ public class DzfyFmService { private static Map babyMap = new HashMap<>(); - private static final String HOSPITALID = "216"; + private static final String HOSPITALID = "1000000114"; static { ONE_ENUMS.put(0, "长"); ONE_ENUMS.put(1, "次"); @@ -156,14 +156,14 @@ public class DzfyFmService { " DELIVER_DOCTOR as DELIVER_DOCTOR"; - //Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); - Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeLocalConnection(); + Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); + //Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeLocalConnection(); QueryRunner queryRunner = new QueryRunner(); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { String sql ="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')" ; + " CREATED > to_date('"+start+"', 'yyyy-mm-dd hh24:mi:ss') and CREATED <= to_date('"+end+"', 'yyyy-mm-dd hh24:mi:ss')" ; if (phone != null) { sql+=" and phone = '"+phone+"'"; @@ -181,7 +181,7 @@ public class DzfyFmService { String id = fm.getID();//获取所有的孕妇ID,方便孕妇产下双胞胎而用 //用来查询这个孕妇分娩的最近日期的sql - String dateSql = "select max(to_char(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mi:ss')) as babyDate from zlhis.v_deliveryinfo where " + + String dateSql = "select max(to_char(CREATED,'yyyy-mm-dd hh24:mi:ss')) as babyDate from zlhis.v_deliveryinfo where " + " ID='"+id+"'" ; //获取到这个孕妇的最近的分娩日期 @@ -195,7 +195,7 @@ public class DzfyFmService { //查询这个孕妇最近日期所有分娩记录的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')" + + " CREATED > to_date('"+startDate+"', 'yyyy-mm-dd hh24:mi:ss') and CREATED <= to_date('"+endDate+"', 'yyyy-mm-dd hh24:mi:ss')" + " and ID='"+id+"'" ; //查出这个ID对应孕妇在这个时间段的分娩记录