Commit f02e92a095651ead8a92ea4c0eb100f297097ef8
1 parent
25e22f3598
Exists in
master
and in
6 other branches
儿童 名字处理
Showing 2 changed files with 10 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
View file @
f02e92a
| ... | ... | @@ -343,6 +343,15 @@ |
| 343 | 343 | if (babyKindergartenCheckModel.getSex() != null) { |
| 344 | 344 | babyKindergartenCheckResult.setSex(babyKindergartenCheckModel.getSex().toString()); |
| 345 | 345 | } |
| 346 | + | |
| 347 | + Map <String, String> getBjId = getBasicConfig(babyKindergartenCheckModel.getBjId()); | |
| 348 | + if (getBjId != null && getBjId.containsKey("name")) { | |
| 349 | + babyKindergartenCheckResult.setBjId(getBjId.get("name")); | |
| 350 | + } | |
| 351 | + Map <String, String> getYeymcId = getBasicConfig(babyKindergartenCheckModel.getYeymcId()); | |
| 352 | + if (getYeymcId != null && getYeymcId.containsKey("name")) { | |
| 353 | + babyKindergartenCheckResult.setYeymcId(getYeymcId.get("name")); | |
| 354 | + } | |
| 346 | 355 | br.setData(babyKindergartenCheckResult); |
| 347 | 356 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 348 | 357 | br.setErrormsg("成功"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
f02e92a
| ... | ... | @@ -3053,7 +3053,7 @@ |
| 3053 | 3053 | data.put("MannualEntry", sive.getMannualEntry());//B超孕天 |
| 3054 | 3054 | |
| 3055 | 3055 | if (sive.getnT() != null && sive.getnT() != 0) { |
| 3056 | - data.put("NT", sive.getnT() * 10); | |
| 3056 | + data.put("NT", sive.getnT()); //2020-09-30 医生反馈两边单位保持mm | |
| 3057 | 3057 | } |
| 3058 | 3058 | data.put("ResponsibleCode", sive.getResponsibleCode());//送检单位编号(送检医院) |
| 3059 | 3059 | data.put("T21", sive.getT21());//既往T21 |