Commit 4fde5b3ceaf7d2b1748e5a2e9aceb383c04c5d8d
1 parent
8363536825
Exists in
master
and in
6 other branches
德州分娩接口
Showing 2 changed files with 18 additions and 39 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java
View file @
4fde5b3
| ... | ... | @@ -170,15 +170,13 @@ |
| 170 | 170 | List<Fm> list = queryRunner.query(conn, sql, new BeanListHandler<Fm>(Fm.class)); |
| 171 | 171 | ExceptionUtils.catchException("size====" + list.size()); |
| 172 | 172 | |
| 173 | - /*List<Fm> list = new ArrayList<Fm>(); | |
| 174 | - Fm fm1 = new Fm(); | |
| 175 | - fm1.setID("33299"); | |
| 176 | - list.add(fm1);*/ | |
| 177 | 173 | |
| 174 | + | |
| 178 | 175 | if(CollectionUtils.isNotEmpty(list)){ |
| 179 | 176 | |
| 180 | 177 | for(Fm fm:list){ |
| 181 | 178 | int a = 0;//用来判断是否建了儿童档案，如果建了儿童档案就不保存分娩记录 |
| 179 | + int count = 0; | |
| 182 | 180 | List<Users> users = new ArrayList<Users>(); |
| 183 | 181 | String id = fm.getID();//获取所有的孕妇ID，方便孕妇产下双胞胎而用 |
| 184 | 182 | String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " + |
| ... | ... | @@ -188,29 +186,6 @@ |
| 188 | 186 | //查出这个ID对应孕妇在这个时间段的分娩记录 |
| 189 | 187 | List<Fm> allList = queryRunner.query(conn, allSql, new BeanListHandler<Fm>(Fm.class)); |
| 190 | 188 | |
| 191 | - /*List<Fm> allList = new ArrayList<Fm>(); | |
| 192 | - Fm fm2 = new Fm(); | |
| 193 | - fm2.setID("33299"); | |
| 194 | - fm2.setBHNUM("201303046"); | |
| 195 | - fm2.setVCCARDNO("143243"); | |
| 196 | - fm2.setNAME("ces"); | |
| 197 | - fm2.setPHONE("10232134234"); | |
| 198 | - fm2.setIDCARD("411628198106018181"); | |
| 199 | - fm2.setADDR("河北省秦皇岛市海港区dz"); | |
| 200 | - fm2.setFETUS_NUM(1); | |
| 201 | - fm2.setPLACENTA_NUM(1); | |
| 202 | - fm2.setPROD_PROCESS_ONE(260); | |
| 203 | - fm2.setPROD_PROCESS_TWO(80); | |
| 204 | - fm2.setPROD_PROCESS_THREE(75); | |
| 205 | - fm2.setTOTAL_PROCESS("550"); | |
| 206 | - fm2.setDELIVER_HOSPITAL("德州市妇幼保健院"); | |
| 207 | - fm2.setBABY_SEX("女"); | |
| 208 | - fm2.setBABY_DELIVERY_TIME(fmt.parse("2017-9-15 12:00:00")); | |
| 209 | - fm2.setBABY_APGAR_SCORE_ONE(10); | |
| 210 | - fm2.setBABY_APGAR_SCORE_FIVE(10); | |
| 211 | - fm2.setBABY_APGAR_SCORE_TEN(10); | |
| 212 | - allList.add(fm2);*/ | |
| 213 | - | |
| 214 | 189 | Date dueDate = null; |
| 215 | 190 | List<MatDeliverAddRequest.Baby> babies = new ArrayList<>(); |
| 216 | 191 | MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); |
| ... | ... | @@ -401,7 +376,10 @@ |
| 401 | 376 | }else{ |
| 402 | 377 | a=1; |
| 403 | 378 | //德州服务器有分娩记录，但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 |
| 404 | - String babyName = allFm.getNAME()+("男".equals(allFm.getBABY_SEX()) ? "之子" : "之女"); | |
| 379 | + List<String> names = buildBabyName(allList); | |
| 380 | + | |
| 381 | + //String babyName = allFm.getNAME()+("男".equals(allFm.getBABY_SEX()) ? "之子" : "之女"); | |
| 382 | + String babyName = allFm.getNAME()+names.get(count).toString(); | |
| 405 | 383 | FmItem fmitem=new FmItem(); |
| 406 | 384 | fmitem.setCcqk(allFm.getBABY_PREGNANCY_OUT()); |
| 407 | 385 | fmitem.setYexb(allFm.getBABY_SEX()); |
| ... | ... | @@ -437,6 +415,7 @@ |
| 437 | 415 | if(baby_Deformity!=null){ |
| 438 | 416 | fmitem.setJx(allFm.getBABY_DEFORMITY().toString()); |
| 439 | 417 | } |
| 418 | + count+=1; | |
| 440 | 419 | buildBaby(fmitem, patient,allFm, dueDate, babyName); |
| 441 | 420 | |
| 442 | 421 | } |
| 443 | 422 | |
| 444 | 423 | |
| 445 | 424 | |
| ... | ... | @@ -457,24 +436,24 @@ |
| 457 | 436 | ExceptionUtils.catchException(e, "sql执行异常"); |
| 458 | 437 | e.printStackTrace(); |
| 459 | 438 | } finally { |
| 460 | - DbUtils.closeQuietly(conn); | |
| 439 | + DbUtils.closeQuietly(conn); | |
| 461 | 440 | } |
| 462 | 441 | } |
| 463 | 442 | |
| 464 | 443 | |
| 465 | - private List buildBabyName(List<FmItem> items) { | |
| 444 | + private List buildBabyName(List<Fm> items) { | |
| 466 | 445 | String id = ""; |
| 467 | 446 | if (items.size() > 2) { |
| 468 | 447 | int boyCount = 0; |
| 469 | 448 | int girlCount = 0; |
| 470 | 449 | List<String> l = new ArrayList<>(); |
| 471 | 450 | for (int i = 0; i < items.size(); i++) { |
| 472 | - FmItem item = items.get(i); | |
| 473 | - if (org.apache.commons.lang.StringUtils.isNotEmpty(item.getYexb())) { | |
| 474 | - if ("男".equals(item.getYexb())) { | |
| 451 | + Fm item = items.get(i); | |
| 452 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(item.getBABY_SEX())) { | |
| 453 | + if ("男".equals(item.getBABY_SEX())) { | |
| 475 | 454 | l.add(ONE_ENUMS.get(boyCount) + "子"); |
| 476 | 455 | boyCount++; |
| 477 | - } else if ("女".equals(item.getYexb())) { | |
| 456 | + } else if ("女".equals(item.getBABY_SEX())) { | |
| 478 | 457 | l.add(ONE_ENUMS.get(girlCount) + "女"); |
| 479 | 458 | girlCount++; |
| 480 | 459 | } |
| 481 | 460 | |
| ... | ... | @@ -483,13 +462,13 @@ |
| 483 | 462 | return l; |
| 484 | 463 | } else { |
| 485 | 464 | for (int i = 0; i < items.size(); i++) { |
| 486 | - FmItem item = items.get(i); | |
| 487 | - if (org.apache.commons.lang.StringUtils.isNotEmpty(item.getYexb())) { | |
| 488 | - if ("男".equals(item.getYexb())) | |
| 465 | + Fm item = items.get(i); | |
| 466 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(item.getBABY_SEX())) { | |
| 467 | + if ("男".equals(item.getBABY_SEX())) | |
| 489 | 468 | { |
| 490 | 469 | id += "1"; |
| 491 | 470 | } |
| 492 | - else if ("女".equals(item.getYexb())) | |
| 471 | + else if ("女".equals(item.getBABY_SEX())) | |
| 493 | 472 | { |
| 494 | 473 | id += "0"; |
| 495 | 474 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
4fde5b3
| ... | ... | @@ -598,7 +598,7 @@ |
| 598 | 598 | if (CollectionUtils.isNotEmpty(babyName)) { |
| 599 | 599 | babyModel.setName(userName + babyName.get(i)); |
| 600 | 600 | } |
| 601 | - babyModel.setYn(YnEnums.NO.getId()); | |
| 601 | + //babyModel.setYn(YnEnums.NO.getId()); | |
| 602 | 602 | |
| 603 | 603 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getMcertNo())) { |
| 604 | 604 |