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 febbe14..29da42c 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 = "1000000114"; + private static final String HOSPITALID = "216"; static { ONE_ENUMS.put(0, "长"); ONE_ENUMS.put(1, "次"); @@ -157,7 +157,7 @@ public class DzfyFmService { //Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); - 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 { @@ -400,6 +400,15 @@ public class DzfyFmService { //德州服务器有分娩记录,但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 List names = buildBabyName(allList); + Date dateTime = fmt.parse(allFm.getBABY_DELIVERY_TIME()); + if(dateTime!=null){ + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME().toString())) { + continue; + }else{ + dueDate = dateTime; + } + } + //String babyName = allFm.getNAME()+("男".equals(allFm.getBABY_SEX()) ? "之子" : "之女"); String babyName = allFm.getNAME()+names.get(count).toString(); FmItem fmitem=new FmItem();