diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java index d43b53a..47dadf2 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java @@ -56,7 +56,7 @@ public class LlfyFmService { private static Map babyMap = new HashMap<>(); - private static final String HOSPITALID = "1000000114"; + private static final String HOSPITALID = "216"; static { ONE_ENUMS.put(0, "长"); ONE_ENUMS.put(1, "次"); @@ -119,30 +119,30 @@ public class LlfyFmService { " 姓名 as NAME,\n" + " 身份证号 as IDCARD,\n" + " CREATED as CREATED,\t\n" + - " 婴儿产出时日 as BABY_DELIVERY_TIME,\n" + + " CONVERT(char(19),婴儿产出时日,120) as BABY_DELIVERY_TIME,\n" + " 婴儿性别 as BABY_SEX,\n" + " 孕周 as DUE_WEEK,\n" + // " DUE_DAY as DUE_DAY,\n" + " 胎次 as FETUS_NUM,\n" + " 窒息 as BABY_ASPHYXIAM,\n" + - " 体重 as BABY_WEIGHT,\n" + - " 身长 as BABY_HEIGHT,\n" + - " Apgar评分1 as BABY_APGAR_SCORE_ONE,\n" + - " Apgar评分5 as BABY_APGAR_SCORE_FIVE,\n" + - " Apgar评分10 as BABY_APGAR_SCORE_TEN,\n" + + " CONVERT(int,left(体重,len(体重)-1)) as BABY_WEIGHT,\n" + + " CONVERT(int,left(身长,len(身长)-2)) as BABY_HEIGHT,\n" + + " CONVERT(int,left(Apgar评分1,len(Apgar评分1)-1)) as BABY_APGAR_SCORE_ONE,\n" + + " CONVERT(int,left(Apgar评分5,len(Apgar评分5)-1)) as BABY_APGAR_SCORE_FIVE,\n" + + " CONVERT(int,left(Apgar评分10,len(Apgar评分10)-1)) as BABY_APGAR_SCORE_TEN,\n" + " 妊娠结局 as BABY_PREGNANCY_OUT,\n" + " 分娩方式 as TMCSIDE,\n" + // " TMCTYPE as TMCTYPE,\n" + " 产妇离开产室情况 as MATERNAL_INFO,\n" + " 会阴切开术 as PERINEAL_CONDITION,\n" + - " 失血量 as SH_LOSE_BLOOD,\n" + + //" 失血量 as SH_LOSE_BLOOD,\n" + // " TH_LOSE_BLOOD as TH_LOSE_BLOOD,\n" + // " 接生者 as DELIVER_DOCTOR,\n" + - " 产程第一期 as PROD_PROCESS_ONE,\n" + - " 第二期 as PROD_PROCESS_TWO,\n" + - " 第三期 as PROD_PROCESS_THREE,\n" + - " 总计 as TOTAL_PROCESS,\n" + - " 胎盘数量 as PLACENTA_NUM,\n" + + // " 产程第一期 as PROD_PROCESS_ONE,\n" + + // " 第二期 as PROD_PROCESS_TWO,\n" + + // " 第三期 as PROD_PROCESS_THREE,\n" + + //" 总计 as TOTAL_PROCESS,\n" + + " CONVERT(int,胎盘数量) as PLACENTA_NUM,\n" + //" DELIVER_HOSPITAL as DELIVER_HOSPITAL,\n" + " 产妇居住地址 as ADDR,\n"+ " 接生者 as DELIVER_DOCTOR"; @@ -155,7 +155,7 @@ public class LlfyFmService { try { String sql ="select "+cloumns+" from xlhhis..v_fmjl where " + - " CREATED > CONVERT(varchar(100), '"+start+"', 120) and CREATED <= CONVERT(varchar(100), '"+start+"', 120)" ; + " CREATED > CONVERT(char(19), '"+start+"', 120) and CREATED <= CONVERT(char(19), '"+start+"', 120)" ; if (phone != null) { sql+=" and 手机号码 = '"+phone+"'"; @@ -163,6 +163,8 @@ public class LlfyFmService { List list = queryRunner.query(conn, sql, new BeanListHandler(Fm.class)); ExceptionUtils.catchException("size====" + list.size()); + /* List list=new ArrayList(); + list.add(fm1);*/ if(CollectionUtils.isNotEmpty(list)){ for(Fm fm:list){ @@ -173,13 +175,13 @@ public class LlfyFmService { String id = fm.getID();//获取所有的孕妇ID，方便孕妇产下双胞胎而用 //用来查询这个孕妇分娩的最近日期的sql - String dateSql = "select max(to_char(CREATED,'yyyy-mm-dd hh24:mi:ss')) as babyDate from xlhhis..v_fmjl where " + + String dateSql = "select max(CONVERT(char(19),CREATED,120)) as babyDate from xlhhis..v_fmjl where " + " ID='"+id+"'" ; //获取到这个孕妇的最近的分娩日期 List dateList = queryRunner.query(conn, dateSql, new BeanListHandler(Fm.class)); Calendar calendar = Calendar.getInstance(); - calendar.setTime(fmt.parse(dateList.get(0).getBabyDate())); + calendar.setTime(fmt.parse(dateList.get(0).getBabyDate())); calendar.add(Calendar.DAY_OF_MONTH, -1); Date sDate = calendar.getTime(); String startDate = fmt.format(sDate); @@ -187,14 +189,14 @@ public class LlfyFmService { //查询这个孕妇最近日期所有分娩记录的sql String allSql = "select "+cloumns+" from xlhhis..v_fmjl where " + - " CREATED > to_date('"+startDate+"', 'yyyy-mm-dd hh24:mi:ss') and CREATED <= to_date('"+endDate+"', 'yyyy-mm-dd hh24:mi:ss')" + + " CREATED > CONVERT(char(19),'"+startDate+"',120) and CREATED <= CONVERT(char(19),'"+endDate+"',120)" + " and ID='"+id+"'" ; //查出这个ID对应孕妇在这个时间段的分娩记录 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<>(); @@ -614,7 +616,7 @@ public class LlfyFmService { request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 - if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM())) + /*if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM())) { Map diags = dzfyHisService.queryHisBabyDiagnosis(fm.getBHNUM()); if (diags != null && diags.size() > 0) @@ -622,7 +624,7 @@ public class LlfyFmService { request.setBlNo(fm.getBHNUM()); request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString()); } - } + }*/ babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId()); }catch (Exception e) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 353fab1..ca39fa5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.hospitalapi.Nczxyy.NczxyyLisService; import com.lyms.hospitalapi.dzfy.DzfyFmService; import com.lyms.hospitalapi.dzfy.DzfyHisService; +import com.lyms.hospitalapi.llfy.LlfyFmService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.hospitalapi.v1.HisService; import com.lyms.platform.biz.service.PatientCheckTicketService; @@ -54,6 +55,8 @@ public class AntenatalExaminationController extends BaseController { private DzfyHisService dzfyHisService; @Autowired private DzfyFmService dzfyFmService; + @Autowired + private LlfyFmService llfyFmService; @Autowired private NczxyyLisService nczxyyLisService; @@ -98,7 +101,7 @@ public class AntenatalExaminationController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/fm") @ResponseBody public String getFm(String start,String end,String syxh){ - dzfyFmService.queryFmPatient(start,end,syxh); + llfyFmService.queryFmPatient(start,end,syxh); return "1"; }