Commit 7d7ce1cf788aa9f3a68b43561fb0bbc12d3afd3b
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
7d7ce1c
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 | import com.lyms.platform.common.enums.*; |
| 6 | 6 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 7 | 7 | import com.lyms.platform.common.utils.DateUtil; |
| 8 | +import com.lyms.platform.common.utils.ExceptionUtils; | |
| 8 | 9 | import com.lyms.platform.common.utils.JsonUtil; |
| 9 | 10 | import com.lyms.platform.operate.web.request.MatDeliverAddRequest; |
| 10 | 11 | import com.lyms.platform.operate.web.result.HighScoreResult; |
| ... | ... | @@ -273,8 +274,7 @@ |
| 273 | 274 | //产检基本信息 |
| 274 | 275 | map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckTime())); |
| 275 | 276 | //产检孕周 |
| 276 | -// map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckTime())); | |
| 277 | - map.put("cDueWeek", checkWeek(patients)); | |
| 277 | + map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckTime())); | |
| 278 | 278 | String checkDoctor = ""; |
| 279 | 279 | |
| 280 | 280 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())){ |
| 281 | 281 | |
| 282 | 282 | |
| ... | ... | @@ -519,10 +519,25 @@ |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | 521 | map.put("ydfmw",ydfmw); |
| 522 | - map.put("ydqjd",FunvCommonUtil.getBaseicConfigByid(ydqjd,basicConfigService)); | |
| 522 | + map.put("ydqjd",FunvCommonUtil.getBaseicConfigByid(ydqjd, basicConfigService)); | |
| 523 | 523 | map.put("bChao",data.getbChao()); |
| 524 | 524 | |
| 525 | + //体重指数 yqWeight | |
| 526 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(data.getYqWeight()) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(data.getHeight())) | |
| 527 | + { | |
| 528 | + try { | |
| 529 | + //体重指数计算规则：孕前体重/身高（单位米）的平方 | |
| 530 | + java.text.DecimalFormat df=new java.text.DecimalFormat("#.#"); | |
| 531 | + double tzzs = Double.parseDouble(data.getYqWeight()) / Math.pow(Double.parseDouble(data.getHeight()) / 100, 2); | |
| 532 | + System.out.println("tzzs=================="+tzzs); | |
| 533 | + map.put("tzzs", df.format(tzzs)); | |
| 534 | + }catch (Exception e) | |
| 535 | + { | |
| 536 | + ExceptionUtils.catchException(e,"体重指数计算错误"); | |
| 537 | + } | |
| 538 | + } | |
| 525 | 539 | |
| 540 | + | |
| 526 | 541 | /* 诊断指导 */ |
| 527 | 542 | String diagnosis = ""; |
| 528 | 543 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getDiagnosis())){ |
| ... | ... | @@ -1148,7 +1163,7 @@ |
| 1148 | 1163 | map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI)); |
| 1149 | 1164 | map.put("phone",patients.getPhone()); |
| 1150 | 1165 | map.put("fmWeek",checkWeek(patients)); |
| 1151 | - map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 1166 | + map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getFmDate())); | |
| 1152 | 1167 | map.put("mremark",patients.getMremark()); |
| 1153 | 1168 | //高危因素 |
| 1154 | 1169 | HighScoreResult highScoreResult = null; |