From 6a22d36967fe1817f6d610e727513b928f552f00 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 18 Sep 2017 10:18:50 +0800 Subject: [PATCH] update code --- .../com/lyms/hospitalapi/dzfy/DzfyFmService.java | 140 ++------------------- 1 file changed, 12 insertions(+), 128 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 3091878..08650d7 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 @@ -56,8 +56,7 @@ public class DzfyFmService { @Autowired private BabyBookbuildingFacade babyBookbuildingFacade; - @Autowired - private QhdfyHisService qhdfyHisService; + @Autowired private DzfyHisService dzfyHisService; @@ -111,77 +110,16 @@ public class DzfyFmService { Date start = new Date(end.getTime()-1000*60*60); String startStr = fmt.format(start); String endStr = fmt.format(end); - System.out.println("start="+startStr+"end="+endStr); - ExceptionUtils.catchException("start=" + startStr + "end=" + endStr); - queryFmPatient(startStr, endStr,null); - } - - public void syncWorker(String startStr,String endStr) { - System.out.println("sync start="+startStr+"end="+endStr); - ExceptionUtils.catchException("start="+startStr+"end="+endStr); - queryFmPatient(startStr, endStr,null); - } - - /** - * 处理以前没有基本信息的记录 - */ - public void handleHistorData() - { - - Date birthEnd = new Date(); - Date birthStart = new Date(birthEnd.getTime()-1000*60*60*24*30); - - MongoCondition condition = MongoCondition.newInstance(); - Criteria c = null; - if (null != birthStart) { - c = Criteria.where("time").gte(birthStart); - } - - if (null != birthEnd) { - if (null != c) { - c = c.lte(birthEnd); - } else { - c = Criteria.where("time").lte(birthEnd); - } - } - - MongoQuery query = new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); - - List list = babyBookbuildingFacade.queryFmHistoryData(query); - if (CollectionUtils.isNotEmpty(list)) - { - SimpleDateFormat formt = new SimpleDateFormat("yyyy-MM-dd"); - String start = null; - try { - start = formt.format(formt.parse("2000-01-01")); - } catch (ParseException e) { - e.printStackTrace(); - } - String end = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); - for (FmRecordModel fm : list) - { - queryFmPatient(start,end,fm.getSyxh()); - } - } - + System.out.println("start=" + startStr + "end=" + endStr); + queryFmPatient(startStr, endStr, null); } - /** - * 删除历史分娩记录 - * @param syxh - */ - private void deleteFmHistoryRecord(String syxh) - { - MongoCondition condition = MongoCondition.newInstance(); - condition = condition.and("syxh", syxh, MongoOper.IS); - babyBookbuildingFacade.deleteFmHistoryRecord(condition.toMongoQuery()); - } - public void syncByPhone(String startStr,String endStr,String syxh) { - queryFmPatient(startStr, endStr,syxh); + public void syncByPhone(String startStr,String endStr,String phone) { + queryFmPatient(startStr, endStr,phone); } - public void queryFmPatient(String start,String end,String syxh) { + public void queryFmPatient(String start,String end,String phone) { String cloumns = " ID as ID,\n" + " BHNUM as BHNUM,\n" + @@ -218,18 +156,17 @@ public class DzfyFmService { " DELIVER_HOSPITAL as DELIVER_HOSPITAL,\n" + " DELIVER_DOCTOR as DELIVER_DOCTOR"; - - String idSql = " ID as ID"; - Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); QueryRunner queryRunner = new QueryRunner(); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat fmt2 = new SimpleDateFormat("yyyyMMdd"); - SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); try { - String sql ="select "+idSql+" from zlhis.v_deliveryinfo where " + - " to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') > to_date('"+start+"', 'yyyy-mm-dd hh24:mm:ss') and to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') <= to_date('"+end+"', 'yyyy-mm-dd hh24:mm:ss')" ; + String sql ="select ID as ID from zlhis.v_deliveryinfo where " + + " to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') > to_date('"+start+"', 'yyyy-mm-dd hh24:mm:ss') and to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') <= to_date('"+end+"', 'yyyy-mm-dd hh24:mm:ss')" ; + if (phone != null) + { + sql+=" and phone = '"+phone+"'"; + } List list = queryRunner.query(conn, sql, new BeanListHandler(Fm.class)); ExceptionUtils.catchException("size====" + list.size()); @@ -284,7 +221,6 @@ public class DzfyFmService { continue; } - PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); query.setType(1); //孕妇 @@ -504,8 +440,6 @@ public class DzfyFmService { buildBaby(fmitem, patient,allFm, dueDate, babyName); } - - } if(a==0){ @@ -516,12 +450,7 @@ public class DzfyFmService { matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); } } - - } - - - } DbUtils.closeQuietly(conn); } catch (Exception e) { @@ -571,14 +500,6 @@ public class DzfyFmService { } } - private void saveFmrecord(String syxh,Date time) - { - FmRecordModel fmRecordModel = new FmRecordModel(); - fmRecordModel.setSyxh(syxh); - fmRecordModel.setTime(time); - babyBookbuildingFacade.saveFmrecord(fmRecordModel); - } - public void buildBaby(FmItem item,Patients patInfo,Fm fm, Date dueDate, String babyName) { try{ @@ -613,11 +534,6 @@ public class DzfyFmService { } } - - - - - if (org.apache.commons.lang.StringUtils.isNotEmpty(fm.getIDCARD())) { request.setMommyCertificateTypeId("70ae1d93-2964-46bc-83fa-bec9ff605b1c"); //证件类型 (身份证号码) @@ -713,37 +629,5 @@ public class DzfyFmService { ExceptionUtils.catchException(e, "buildBaby exception"); e.printStackTrace(); } - - } - - /** - *查询通过分娩的syxh来查询对应孕妇的基本信息 - * @param syxh - * @return - */ - public FmPatInfo getFmPatInfoById(String syxh) - { - Connection conn = ConnTools.makeHisConnection(); - QueryRunner queryRunner = new QueryRunner(); - try { - FmPatInfo patInfo = null; - - List list = queryRunner.query(conn, "SELECT ID as syxh,NAME as name,IDCARD as cardNo,PHONE as phone FROM zlhis.v_deliveryinfo WHERE PHONE is not null and IDCARD is not null and length(PHONE) = 11 and ID = '"+syxh+"'", new BeanListHandler(FmPatInfo.class)); - if (CollectionUtils.isNotEmpty(list)) { - patInfo = list.get(0); - } - - DbUtils.closeQuietly(conn); - return patInfo; - - } catch (SQLException e) { - DbUtils.closeQuietly(conn); - e.printStackTrace(); - } - return null; - } - - - } -- 1.8.3.1