Commit 3f8242e8430b311953d6b3bf60949b5609a81b0a

Authored by gengxiaokai
1 parent 875771f2e3
Exists in master and in 1 other branch dev

诸城分娩接口修改

Showing 1 changed file with 10 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java View file @ 3f8242e
... ... @@ -126,8 +126,8 @@
126 126 " substr(DUE_WEEK,0,2) as DUE_WEEK,\n" +
127 127 " substr(DUE_WEEK,4) as DUE_DAY, \n"+
128 128 " FETUS_NUM as FETUS_NUM,\n" +
129   - " to_number(BABY_WEIGHT) as BABY_WEIGHT,\n" +
130   - " to_number(BABY_HEIGHT) as BABY_HEIGHT,\n" +
  129 + " BABY_WEIGHT as SBABY_WEIGHT,\n" +
  130 + " BABY_HEIGHT as SBABY_HEIGHT,\n" +
131 131 " BABY_APGAR_SCORE_ONE as SBABY_APGAR_SCORE_ONE,\n" +
132 132 " BABY_APGAR_SCORE_FIVE as SBABY_APGAR_SCORE_FIVE,\n" +
133 133 " BABY_APGAR_SCORE_TEN as SBABY_APGAR_SCORE_TEN,\n" +
134 134  
135 135  
... ... @@ -359,14 +359,14 @@
359 359  
360 360 baby.setApgarScore(as);
361 361 baby.setBabyGender("男".equals(allFm.getBABY_SEX()) ? "1" : "0");
362   - Integer babyHeight = allFm.getBABY_HEIGHT();
363   - Integer babyWeight = allFm.getBABY_WEIGHT();
  362 + Integer babyHeight = Integer.valueOf(allFm.getSBABY_HEIGHT());
  363 + Integer babyWeight = Integer.valueOf(allFm.getSBABY_WEIGHT());
364 364 Integer baby_Asphyxiam = allFm.getBABY_ASPHYXIAM();
365 365 if(babyHeight!=null){
366   - baby.setBabyHeight(allFm.getBABY_HEIGHT().toString());//新生儿生长
  366 + baby.setBabyHeight(allFm.getSBABY_HEIGHT());//新生儿生长
367 367 }
368 368 if(babyWeight!=null){
369   - baby.setBabyWeight(allFm.getBABY_WEIGHT().toString());//新生儿重量
  369 + baby.setBabyWeight(allFm.getSBABY_WEIGHT());//新生儿重量
370 370 }
371 371 if(baby_Asphyxiam!=null){
372 372 baby.setAsphyxiaM(allFm.getBABY_ASPHYXIAM().toString()); //窒息分钟
373 373  
374 374  
... ... @@ -409,13 +409,13 @@
409 409 fmitem.setDjt(allFm.getFETUS_NUM().toString());
410 410 }
411 411 fmitem.setCjc("");
412   - Integer babyHeight = allFm.getBABY_HEIGHT();
413   - Integer babyWeight = allFm.getBABY_WEIGHT();
  412 + Integer babyHeight = Integer.valueOf(allFm.getSBABY_HEIGHT());
  413 + Integer babyWeight = Integer.valueOf(allFm.getSBABY_WEIGHT());
414 414 if(babyHeight!=null){
415   - fmitem.setSc(allFm.getBABY_HEIGHT().toString());
  415 + fmitem.setSc(allFm.getSBABY_HEIGHT());
416 416 }
417 417 if(babyWeight!=null){
418   - fmitem.setTz(allFm.getBABY_WEIGHT().toString());
  418 + fmitem.setTz(allFm.getSBABY_WEIGHT());
419 419 }
420 420 String pf1 = allFm.getSBABY_APGAR_SCORE_ONE();
421 421 String pf5 = allFm.getSBABY_APGAR_SCORE_FIVE();