Commit e3a2325fab0af8de6bd8652c157c338c84c7d199
1 parent
55109c306f
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 12 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
e3a2325
| ... | ... | @@ -286,7 +286,7 @@ |
| 286 | 286 | xxbfx[6] = result; |
| 287 | 287 | } |
| 288 | 288 | //RH血型 |
| 289 | - if ("RH".equals(code)) | |
| 289 | + if ("RH".equals(code) || "RHD".equals(code)) | |
| 290 | 290 | { |
| 291 | 291 | if (result.contains("阴性")) |
| 292 | 292 | { |
| 293 | 293 | |
| 294 | 294 | |
| ... | ... | @@ -460,15 +460,16 @@ |
| 460 | 460 | } |
| 461 | 461 | } |
| 462 | 462 | } |
| 463 | + wifeClinicalCheck.put("bdjc",bdjc); | |
| 464 | + wifeClinicalCheck.put("xxbfx",xxbfx); | |
| 465 | + wifeClinicalCheck.put("yigan",yigan); | |
| 466 | + wifeClinicalCheck.put("ncg",ncg); | |
| 467 | + | |
| 468 | + preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck); | |
| 463 | 469 | } |
| 464 | 470 | |
| 465 | 471 | |
| 466 | - wifeClinicalCheck.put("bdjc",bdjc); | |
| 467 | - wifeClinicalCheck.put("xxbfx",xxbfx); | |
| 468 | - wifeClinicalCheck.put("yigan",yigan); | |
| 469 | - wifeClinicalCheck.put("ncg",ncg); | |
| 470 | 472 | |
| 471 | - preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck); | |
| 472 | 473 | |
| 473 | 474 | //乙肝血清学检查 |
| 474 | 475 | Integer[] hyigan = new Integer[]{-1,-1,-1,-1,-1}; |
| ... | ... | @@ -499,7 +500,7 @@ |
| 499 | 500 | String result = itemModel.getResult(); |
| 500 | 501 | |
| 501 | 502 | //RH血型 |
| 502 | - if ("RH".equals(code)) | |
| 503 | + if ("RH".equals(code) || "RHD".equals(code)) | |
| 503 | 504 | { |
| 504 | 505 | if (result.contains("阴性")) |
| 505 | 506 | { |
| 506 | 507 | |
| ... | ... | @@ -613,11 +614,12 @@ |
| 613 | 614 | } |
| 614 | 615 | } |
| 615 | 616 | } |
| 617 | + husbandClinicalCheck.put("yigan",hyigan); | |
| 618 | + husbandClinicalCheck.put("ncg",hncg); | |
| 619 | + preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck); | |
| 616 | 620 | } |
| 617 | 621 | |
| 618 | - husbandClinicalCheck.put("yigan",hyigan); | |
| 619 | - husbandClinicalCheck.put("ncg",hncg); | |
| 620 | - preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck); | |
| 622 | + | |
| 621 | 623 | Query query1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
| 622 | 624 | Update update = MongoConvertHelper |
| 623 | 625 | .convertToNativeUpdate(ReflectionUtils.getUpdateField(preEugenicsBaseModel)); |