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 5a92b77..d0e88a7 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 @@ -301,9 +301,15 @@ 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(sieveModel.getRenShenResult() != null){ + diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString()); + } + if(sieveModel.getTireNumber() != null){ + diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString()); + } + if(sieveModel.getStatus() != null){ + diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); + } if("0".equals(sieveModel.getZtfx())){ diagnosisModel.setZtfx("0"); diagnosisModel.setZtfeText("低风险");