From e3a2325fab0af8de6bd8652c157c338c84c7d199 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 1 Nov 2021 19:25:18 +0800 Subject: [PATCH] update --- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index eda3f9a..a998f8e 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -286,7 +286,7 @@ public class LhxfyService { xxbfx[6] = result; } //RH血型 - if ("RH".equals(code)) + if ("RH".equals(code) || "RHD".equals(code)) { if (result.contains("阴性")) { @@ -460,15 +460,16 @@ public class LhxfyService { } } } + wifeClinicalCheck.put("bdjc",bdjc); + wifeClinicalCheck.put("xxbfx",xxbfx); + wifeClinicalCheck.put("yigan",yigan); + wifeClinicalCheck.put("ncg",ncg); + + preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck); } - wifeClinicalCheck.put("bdjc",bdjc); - wifeClinicalCheck.put("xxbfx",xxbfx); - wifeClinicalCheck.put("yigan",yigan); - wifeClinicalCheck.put("ncg",ncg); - preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck); //乙肝血清学检查 Integer[] hyigan = new Integer[]{-1,-1,-1,-1,-1}; @@ -499,7 +500,7 @@ public class LhxfyService { String result = itemModel.getResult(); //RH血型 - if ("RH".equals(code)) + if ("RH".equals(code) || "RHD".equals(code)) { if (result.contains("阴性")) { @@ -613,11 +614,12 @@ public class LhxfyService { } } } + husbandClinicalCheck.put("yigan",hyigan); + husbandClinicalCheck.put("ncg",hncg); + preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck); } - husbandClinicalCheck.put("yigan",hyigan); - husbandClinicalCheck.put("ncg",hncg); - preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck); + Query query1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(preEugenicsBaseModel)); -- 1.8.3.1