From 9f5b86714796deceee8663359d332963c5f67793 Mon Sep 17 00:00:00 2001 From: wtt Date: Sat, 28 Mar 2020 13:14:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E7=97=85=E9=97=A8=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/worker/TwinsPatientWorker.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java index 97d7930..11571ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java @@ -265,7 +265,11 @@ public class TwinsPatientWorker implements Callable> { if (StringUtils.isNotEmpty(srt)) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { - sb.append(basicConfig.getName()).append(','); + if(basicConfig.getName().contains("双绒双羊") || + basicConfig.getName().contains("单绒双羊") || + basicConfig.getName().contains("单绒单羊")){ + sb.append(basicConfig.getName()).append(','); + } } } } @@ -275,11 +279,11 @@ public class TwinsPatientWorker implements Callable> { twinsPatientsResult.setrFactor(sb.toString()); } - if (!"-".equals(twinsPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) { + /* if (!"-".equals(twinsPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) { twinsPatientsResult.setrFactor(twinsPatientsResult.getrFactor() + "," + patients.getoRiskFactor()); } else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) { twinsPatientsResult.setrFactor(patients.getoRiskFactor()); - } + }*/ } else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) { twinsPatientsResult.setrFactor(patients.getoRiskFactor()); } -- 1.8.3.1