From f4fe23c74b320bbb3c00afd0213841be634b57f4 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Sat, 29 Sep 2018 18:00:33 +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 | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 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 19969bc..900bc97 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 @@ -455,21 +455,30 @@ public class DiagnosisFacaed { List list = sieveService.queryList1(sieveQuery, "order"); if (list != null && list.size() > 0) { SieveModel sieveModel = list.get(0); - diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString()); - diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString()); - diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); - if ("0".equals(sieveModel.getZtfx())) { - diagnosisModel.setZtfx("0"); - diagnosisModel.setZtfeText("低风险"); + if(null != sieveModel.getRenShenResult()){ + diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString()); } - if ("1".equals(sieveModel.getZtfx())) { - diagnosisModel.setZtfx("1"); - diagnosisModel.setZtfeText("临界值"); + if(null != sieveModel.getTireNumber()){ + diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString()); } - if ("2".equals(sieveModel.getZtfx())) { - diagnosisModel.setZtfx("2"); - diagnosisModel.setZtfeText("高风险"); + if(null != sieveModel.getStatus()){ + diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); } + 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("高风险"); + } + } + } mList.add(diagnosisModel.contomap(patients)); } -- 1.8.3.1