Commit 5667b3eec6095af2ef48d946275c787c70a910d1
1 parent
f257469f58
Exists in
master
and in
6 other branches
德州分娩接口
Showing 3 changed files with 69 additions and 38 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java
View file @
5667b3e
... | ... | @@ -7,6 +7,7 @@ |
7 | 7 | import com.lyms.platform.common.dao.operator.MongoOper; |
8 | 8 | import com.lyms.platform.common.dao.operator.MongoQuery; |
9 | 9 | import com.lyms.platform.common.enums.*; |
10 | +import com.lyms.platform.common.utils.PropertiesUtils; | |
10 | 11 | import com.lyms.platform.common.utils.DateUtil; |
11 | 12 | import com.lyms.platform.common.utils.ExceptionUtils; |
12 | 13 | import com.lyms.platform.common.utils.StringUtils; |
... | ... | @@ -65,6 +66,7 @@ |
65 | 66 | |
66 | 67 | private static Map<String, List> babyMap = new HashMap<>(); |
67 | 68 | |
69 | + private static final String HOSPITALID = PropertiesUtils.getPropertyValue("hospitalId"); | |
68 | 70 | static { |
69 | 71 | ONE_ENUMS.put(0, "长"); |
70 | 72 | ONE_ENUMS.put(1, "次"); |
71 | 73 | |
... | ... | @@ -231,32 +233,15 @@ |
231 | 233 | List<Fm> list = queryRunner.query(conn, sql, new BeanListHandler<Fm>(Fm.class)); |
232 | 234 | ExceptionUtils.catchException("size====" + list.size()); |
233 | 235 | |
234 | - /* List<Fm> list = new ArrayList<Fm>(); | |
235 | - Fm fm = new Fm(); | |
236 | - fm.setID("33299"); | |
237 | - fm.setBHNUM("201303046"); | |
238 | - fm.setVCCARDNO("123654"); | |
239 | - fm.setNAME("小香香"); | |
240 | - fm.setPHONE("18613211129"); | |
241 | - fm.setIDCARD("530103198705306240"); | |
242 | - fm.setADDR("山东省烟台市芝罘区就是"); | |
243 | - fm.setFETUS_NUM(1); | |
244 | - fm.setPLACENTA_NUM(1); | |
245 | - fm.setPROD_PROCESS_ONE(240); | |
246 | - fm.setPROD_PROCESS_TWO(30); | |
247 | - fm.setPROD_PROCESS_THREE(5); | |
248 | - fm.setTOTAL_PROCESS("550"); | |
249 | - fm.setDELIVER_HOSPITAL("德州市妇幼保健院"); | |
250 | - fm.setBABY_SEX("男"); | |
251 | - fm.setBABY_DELIVERY_TIME(fmt.parse("2017-9-11 13:53:00")); | |
252 | - fm.setBABY_APGAR_SCORE_ONE(10); | |
253 | - fm.setBABY_APGAR_SCORE_FIVE(10); | |
254 | - fm.setBABY_APGAR_SCORE_TEN(10); | |
255 | - list.add(fm);*/ | |
236 | + /*List<Fm> list = new ArrayList<Fm>(); | |
237 | + Fm fm1 = new Fm(); | |
238 | + fm1.setID("33299"); | |
239 | + list.add(fm1);*/ | |
256 | 240 | |
257 | 241 | if(CollectionUtils.isNotEmpty(list)){ |
258 | 242 | |
259 | 243 | for(Fm fm:list){ |
244 | + int a = 0;//用来判断是否建了儿童档案,如果建了儿童档案就不保存分娩记录 | |
260 | 245 | List<Users> users = new ArrayList<Users>(); |
261 | 246 | String id = fm.getID();//获取所有的孕妇ID,方便孕妇产下双胞胎而用 |
262 | 247 | String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " + |
... | ... | @@ -266,6 +251,29 @@ |
266 | 251 | //查出这个ID对应孕妇在这个时间段的分娩记录 |
267 | 252 | List<Fm> allList = queryRunner.query(conn, allSql, new BeanListHandler<Fm>(Fm.class)); |
268 | 253 | |
254 | + /*List<Fm> allList = new ArrayList<Fm>(); | |
255 | + Fm fm2 = new Fm(); | |
256 | + fm2.setID("33299"); | |
257 | + fm2.setBHNUM("201303046"); | |
258 | + fm2.setVCCARDNO("143243"); | |
259 | + fm2.setNAME("ces"); | |
260 | + fm2.setPHONE("10232134234"); | |
261 | + fm2.setIDCARD("411628198106018181"); | |
262 | + fm2.setADDR("河北省秦皇岛市海港区dz"); | |
263 | + fm2.setFETUS_NUM(1); | |
264 | + fm2.setPLACENTA_NUM(1); | |
265 | + fm2.setPROD_PROCESS_ONE(260); | |
266 | + fm2.setPROD_PROCESS_TWO(80); | |
267 | + fm2.setPROD_PROCESS_THREE(75); | |
268 | + fm2.setTOTAL_PROCESS("550"); | |
269 | + fm2.setDELIVER_HOSPITAL("德州市妇幼保健院"); | |
270 | + fm2.setBABY_SEX("女"); | |
271 | + fm2.setBABY_DELIVERY_TIME(fmt.parse("2017-9-15 12:00:00")); | |
272 | + fm2.setBABY_APGAR_SCORE_ONE(10); | |
273 | + fm2.setBABY_APGAR_SCORE_FIVE(10); | |
274 | + fm2.setBABY_APGAR_SCORE_TEN(10); | |
275 | + allList.add(fm2);*/ | |
276 | + | |
269 | 277 | Date dueDate = null; |
270 | 278 | List<MatDeliverAddRequest.Baby> babies = new ArrayList<>(); |
271 | 279 | MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); |
272 | 280 | |
... | ... | @@ -276,7 +284,13 @@ |
276 | 284 | continue; |
277 | 285 | } |
278 | 286 | |
287 | + | |
279 | 288 | PatientsQuery query = new PatientsQuery(); |
289 | + query.setYn(YnEnums.YES.getId()); | |
290 | + query.setType(1); //孕妇 | |
291 | + query.setDueStatus(0); //未终止妊娠 | |
292 | + String[] strs = new String[]{allFm.getPHONE(),allFm.getIDCARD()}; | |
293 | + query.setPc(strs); | |
280 | 294 | |
281 | 295 | //查询该孕妇是否在孕产婴系统中建档 |
282 | 296 | List<Patients> patientses = patientsService.queryPatient(query); |
... | ... | @@ -286,7 +300,7 @@ |
286 | 300 | patient = patientses.get(0); |
287 | 301 | UsersQuery usersQuery = new UsersQuery(); |
288 | 302 | usersQuery.setYn(YnEnums.YES.getId()); |
289 | - usersQuery.setOrgId(1000000114); | |
303 | + usersQuery.setOrgId(new Integer(Integer.parseInt(HOSPITALID))); | |
290 | 304 | usersQuery.setName("产房"); |
291 | 305 | users = usersService.queryUsers(usersQuery); |
292 | 306 | |
293 | 307 | |
294 | 308 | |
295 | 309 | |
296 | 310 | |
... | ... | @@ -296,25 +310,36 @@ |
296 | 310 | if(dateTime!=null){ |
297 | 311 | if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME().toString())) { |
298 | 312 | continue; |
313 | + }else{ | |
314 | + dueDate = dateTime; | |
299 | 315 | } |
300 | 316 | }else{ |
301 | 317 | continue; |
302 | 318 | } |
303 | 319 | |
304 | - Map<String, String> map = new HashMap<>(); | |
320 | + Map<String, Map<String,String>> map = new HashMap<>(); | |
321 | + Map<String, String> map1 = new HashMap<>(); | |
322 | + Map<String, String> map2 = new HashMap<>(); | |
323 | + Map<String, String> map3 = new HashMap<>(); | |
305 | 324 | Map<String, String> totalMap = new HashMap<>(); |
306 | 325 | |
307 | 326 | Integer prod_Process_One = allFm.getPROD_PROCESS_ONE(); |
308 | 327 | Integer prod_Process_Two = allFm.getPROD_PROCESS_TWO(); |
309 | 328 | Integer prod_Process_Three = allFm.getPROD_PROCESS_THREE(); |
310 | 329 | if(prod_Process_One!=null){ |
311 | - map.put("one",allFm.getPROD_PROCESS_ONE().toString()); | |
330 | + map1.put("h",String.valueOf(prod_Process_One.intValue()/60)); | |
331 | + map1.put("m",String.valueOf(prod_Process_One.intValue()%60)); | |
332 | + map.put("one", map1); | |
312 | 333 | } |
313 | 334 | if(prod_Process_Two!=null){ |
314 | - map.put("two",allFm.getPROD_PROCESS_TWO().toString()); | |
335 | + map2.put("h",String.valueOf(prod_Process_Two.intValue()/60)); | |
336 | + map2.put("m",String.valueOf(prod_Process_Two.intValue()%60)); | |
337 | + map.put("two",map2); | |
315 | 338 | } |
316 | 339 | if(prod_Process_Three!=null){ |
317 | - map.put("three",allFm.getPROD_PROCESS_THREE().toString()); | |
340 | + map3.put("h",String.valueOf(prod_Process_Three.intValue()/60)); | |
341 | + map3.put("m",String.valueOf(prod_Process_Three.intValue()%60)); | |
342 | + map.put("three",map3); | |
318 | 343 | } |
319 | 344 | |
320 | 345 | int hProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())/60;//总产程小时数 |
... | ... | @@ -438,7 +463,7 @@ |
438 | 463 | |
439 | 464 | } |
440 | 465 | }else{ |
441 | - | |
466 | + a=1; | |
442 | 467 | //德州服务器有分娩记录,但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 |
443 | 468 | String babyName = allFm.getNAME()+("男".equals(allFm.getBABY_SEX()) ? "之子" : "之女"); |
444 | 469 | FmItem fmitem=new FmItem(); |
445 | 470 | |
... | ... | @@ -483,13 +508,16 @@ |
483 | 508 | |
484 | 509 | } |
485 | 510 | |
486 | - deliverAddRequest.setBabies(babies); | |
487 | - deliverAddRequest.setFmHospital("1000000114"); //设置为德州妇幼 | |
488 | - ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest); | |
489 | - if(users!=null && users.size()>0){ | |
490 | - matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); | |
511 | + if(a==0){ | |
512 | + deliverAddRequest.setBabies(babies); | |
513 | + deliverAddRequest.setFmHospital(HOSPITALID); //设置为德州妇幼 | |
514 | + ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest); | |
515 | + if(users!=null && users.size()>0){ | |
516 | + matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); | |
517 | + } | |
491 | 518 | } |
492 | 519 | |
520 | + | |
493 | 521 | } |
494 | 522 | |
495 | 523 | |
496 | 524 | |
... | ... | @@ -565,11 +593,11 @@ |
565 | 593 | UsersQuery usersQuery = new UsersQuery(); |
566 | 594 | usersQuery.setYn(YnEnums.YES.getId()); |
567 | 595 | usersQuery.setName("产房"); |
568 | - usersQuery.setOrgId(1000000114); | |
596 | + usersQuery.setOrgId(new Integer(Integer.parseInt(HOSPITALID))); | |
569 | 597 | List<Users> users = usersService.queryUsers(usersQuery); |
570 | 598 | |
571 | 599 | BabyBookbuildingAddRequest request = new BabyBookbuildingAddRequest(); |
572 | - request.setHospitalId("1000000114"); | |
600 | + request.setHospitalId(HOSPITALID); | |
573 | 601 | |
574 | 602 | request.setMommyName(fm.getNAME()); //母亲姓名 |
575 | 603 | Date bir = patInfo.getBirth(); |
... | ... | @@ -658,7 +686,7 @@ |
658 | 686 | } |
659 | 687 | |
660 | 688 | request.setApgarScore(map); |
661 | - request.setDeliverOrg("1000000114"); | |
689 | + request.setDeliverOrg(HOSPITALID); | |
662 | 690 | |
663 | 691 | request.setBuildDoctor(users.get(0).getId() + ""); |
664 | 692 | request.setBuildDate(DateUtil.getyyyy_MM_dd(dueDate)); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
5667b3e
... | ... | @@ -95,12 +95,12 @@ |
95 | 95 | |
96 | 96 | |
97 | 97 | |
98 | - /*@RequestMapping(method = RequestMethod.GET, value = "/fm") | |
98 | + @RequestMapping(method = RequestMethod.GET, value = "/fm") | |
99 | 99 | @ResponseBody |
100 | 100 | public String getFm(String start,String end,String syxh){ |
101 | 101 | dzfyFmService.queryFmPatient(start,end,syxh); |
102 | 102 | return "1"; |
103 | - }*/ | |
103 | + } | |
104 | 104 | |
105 | 105 | |
106 | 106 |
platform-operate-api/src/main/resources/config.properties
View file @
5667b3e