From 444695a684ffd689776fda7e8a9a37b6e672d275 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Sat, 29 Sep 2018 09:52:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/DiagnosisFacaed.java | 48 ++++++++++++---------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index dc56586..b58efe1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -128,17 +128,19 @@ public class DiagnosisFacaed { } } diagnosisResult.setSieveProject(sList); - if(0 == sieveModel.getZtfx()){ - diagnosisResult.setZtfx("0"); - diagnosisResult.setZtfeText("低风险"); - } - if(1 == sieveModel.getZtfx()){ - diagnosisResult.setZtfx("1"); - diagnosisResult.setZtfeText("临界值"); - } - if(2 == sieveModel.getZtfx()){ - diagnosisResult.setZtfx("2"); - diagnosisResult.setZtfeText("高风险"); + if(null != sieveModel.getZtfx()){ + if(0 == sieveModel.getZtfx()){ + diagnosisResult.setZtfx("0"); + diagnosisResult.setZtfeText("低风险"); + } + if(1 == sieveModel.getZtfx()){ + diagnosisResult.setZtfx("1"); + diagnosisResult.setZtfeText("临界值"); + } + if(2 == sieveModel.getZtfx()){ + diagnosisResult.setZtfx("2"); + diagnosisResult.setZtfeText("高风险"); + } } } }else{ @@ -311,17 +313,19 @@ public class DiagnosisFacaed { if(sieveModel.getStatus() != null){ diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); } - if(0 == sieveModel.getZtfx()){ - diagnosisModel.setZtfx("0"); - diagnosisModel.setZtfeText("低风险"); - } - if(1 == sieveModel.getZtfx()){ - diagnosisModel.setZtfx("1"); - diagnosisModel.setZtfeText("临界值"); - } - if(2 == sieveModel.getZtfx()){ - diagnosisModel.setZtfx("2"); - diagnosisModel.setZtfeText("高风险"); + if(null != sieveModel.getZtfx()){ + if(0 == sieveModel.getZtfx()){ + diagnosisModel.setZtfx("0"); + diagnosisModel.setZtfeText("低风险"); + } + if(1 == sieveModel.getZtfx()){ + diagnosisModel.setZtfx("1"); + diagnosisModel.setZtfeText("临界值"); + } + if(2 == sieveModel.getZtfx()){ + diagnosisModel.setZtfx("2"); + diagnosisModel.setZtfeText("高风险"); + } } } } -- 1.8.3.1