diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java index 3bf194f..1d03fa9 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java @@ -159,7 +159,7 @@ public class HsfyFmService { Connection conn = com.lyms.hospitalapi.hs.ConnTools.makeFmConnection(); QueryRunner queryRunner = new QueryRunner(); - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm"); try { String sql ="select "+cloumns+" from v_deliveryinfo where " + @@ -181,7 +181,7 @@ public class HsfyFmService { String id = fm.getID();//获取所有的孕妇ID,方便孕妇产下双胞胎而用 //用来查询这个孕妇分娩的最近日期的sql - String dateSql = "select max(to_char(CREATED,'yyyy-mm-dd hh24:mi:ss')) as babyDate from zlhis.v_deliveryinfo where " + + String dateSql = "select max(CREATED) as babyDate from v_deliveryinfo where " + " ID='"+id+"'" ; //获取到这个孕妇的最近的分娩日期 @@ -190,12 +190,15 @@ public class HsfyFmService { calendar.setTime(fmt.parse(dateList.get(0).getBabyDate())); calendar.add(Calendar.DAY_OF_MONTH, -1); Date sDate = calendar.getTime(); - String startDate = fmt.format(sDate); + + SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String startDate = fmt1.format(sDate); String endDate = dateList.get(0).getBabyDate(); + //查询这个孕妇最近日期所有分娩记录的sql - String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " + - " CREATED > to_date('"+startDate+"', 'yyyy-mm-dd hh24:mi:ss') and CREATED <= to_date('"+endDate+"', 'yyyy-mm-dd hh24:mi:ss')" + + String allSql = "select "+cloumns+" from v_deliveryinfo where " + + " CREATED > CONVERT(DATETIME,'" + startDate + "', 120) and CREATED <= CONVERT(DATETIME,'" + endDate + "', 120)" + " and ID='"+id+"'" ; //查出这个ID对应孕妇在这个时间段的分娩记录 @@ -307,17 +310,17 @@ public class HsfyFmService { if(placenta_Num!=null){ deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1) } - if ("完好".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) { + if ("完整".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) { deliverAddRequest.setPerinealCondition("full"); - } else if ("会阴切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) { + } else if ("切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) { deliverAddRequest.setPerinealCondition("split"); } - if ("一度裂伤".equals(allFm.getPERINEAL_CONDITION())) { + if ("1度".equals(allFm.getPERINEAL_CONDITION())) { deliverAddRequest.setSiLielevel(1); - } else if ("二度裂伤".equals(allFm.getPERINEAL_CONDITION())) { + } else if ("2度".equals(allFm.getPERINEAL_CONDITION())) { deliverAddRequest.setSiLielevel(2); - } else if ("三度裂伤".equals(allFm.getPERINEAL_CONDITION())) { + } else if ("3度".equals(allFm.getPERINEAL_CONDITION())) { deliverAddRequest.setSiLielevel(3); } @@ -400,7 +403,7 @@ public class HsfyFmService { } }else{ a=1; - //德州服务器有分娩记录,但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 + //服务器有分娩记录,但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 List names = buildBabyName(allList); Date dateTime = fmt.parse(allFm.getBABY_DELIVERY_TIME()); @@ -457,7 +460,7 @@ public class HsfyFmService { if(a==0){ deliverAddRequest.setBabies(babies); - deliverAddRequest.setFmHospital(HOSPITALID); //设置为德州妇幼 + deliverAddRequest.setFmHospital(HOSPITALID); // ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest); if(users!=null && users.size()>0){ matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); 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 4e37add..374536f 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 @@ -652,7 +652,7 @@ public class AntenatalExaminationController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/antexCheckCount") @ResponseBody - public BaseResponse antexCheckCount(@PathVariable String checkTime, HttpServletRequest request) { + public BaseResponse antexCheckCount(@RequestParam String checkTime, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return antenatalExaminationFacade.antexCheckCount(checkTime,loginState.getId()); }