Commit ea6b572436e5b3e0d3bec9958402f9674627590c
1 parent
154fbb8d9f
Exists in
master
and in
6 other branches
德州分娩接口
Showing 1 changed file with 11 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java
View file @
ea6b572
| ... | ... | @@ -65,7 +65,7 @@ |
| 65 | 65 | |
| 66 | 66 | private static Map<String, List> babyMap = new HashMap<>(); |
| 67 | 67 | |
| 68 | - private static final String HOSPITALID = "1000000114"; | |
| 68 | + private static final String HOSPITALID = "216"; | |
| 69 | 69 | static { |
| 70 | 70 | ONE_ENUMS.put(0, "长"); |
| 71 | 71 | ONE_ENUMS.put(1, "次"); |
| ... | ... | @@ -157,7 +157,7 @@ |
| 157 | 157 | |
| 158 | 158 | |
| 159 | 159 | //Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); |
| 160 | - Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); | |
| 160 | + Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeLocalConnection(); | |
| 161 | 161 | QueryRunner queryRunner = new QueryRunner(); |
| 162 | 162 | SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 163 | 163 | try { |
| ... | ... | @@ -399,6 +399,15 @@ |
| 399 | 399 | a=1; |
| 400 | 400 | //德州服务器有分娩记录，但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 |
| 401 | 401 | List<String> names = buildBabyName(allList); |
| 402 | + | |
| 403 | + Date dateTime = fmt.parse(allFm.getBABY_DELIVERY_TIME()); | |
| 404 | + if(dateTime!=null){ | |
| 405 | + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME().toString())) { | |
| 406 | + continue; | |
| 407 | + }else{ | |
| 408 | + dueDate = dateTime; | |
| 409 | + } | |
| 410 | + } | |
| 402 | 411 | |
| 403 | 412 | //String babyName = allFm.getNAME()+("男".equals(allFm.getBABY_SEX()) ? "之子" : "之女"); |
| 404 | 413 | String babyName = allFm.getNAME()+names.get(count).toString(); |