Commit 444695a684ffd689776fda7e8a9a37b6e672d275
1 parent
375e06196d
Exists in
master
and in
6 other branches
产前诊断
Showing 1 changed file with 26 additions and 22 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
View file @
444695a
... | ... | @@ -128,18 +128,20 @@ |
128 | 128 | } |
129 | 129 | } |
130 | 130 | diagnosisResult.setSieveProject(sList); |
131 | - if(0 == sieveModel.getZtfx()){ | |
132 | - diagnosisResult.setZtfx("0"); | |
133 | - diagnosisResult.setZtfeText("低风险"); | |
131 | + if(null != sieveModel.getZtfx()){ | |
132 | + if(0 == sieveModel.getZtfx()){ | |
133 | + diagnosisResult.setZtfx("0"); | |
134 | + diagnosisResult.setZtfeText("低风险"); | |
135 | + } | |
136 | + if(1 == sieveModel.getZtfx()){ | |
137 | + diagnosisResult.setZtfx("1"); | |
138 | + diagnosisResult.setZtfeText("临界值"); | |
139 | + } | |
140 | + if(2 == sieveModel.getZtfx()){ | |
141 | + diagnosisResult.setZtfx("2"); | |
142 | + diagnosisResult.setZtfeText("高风险"); | |
143 | + } | |
134 | 144 | } |
135 | - if(1 == sieveModel.getZtfx()){ | |
136 | - diagnosisResult.setZtfx("1"); | |
137 | - diagnosisResult.setZtfeText("临界值"); | |
138 | - } | |
139 | - if(2 == sieveModel.getZtfx()){ | |
140 | - diagnosisResult.setZtfx("2"); | |
141 | - diagnosisResult.setZtfeText("高风险"); | |
142 | - } | |
143 | 145 | } |
144 | 146 | }else{ |
145 | 147 | diagnosisResult.setIsCqSieve("0");//未筛查 |
... | ... | @@ -311,17 +313,19 @@ |
311 | 313 | if(sieveModel.getStatus() != null){ |
312 | 314 | diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); |
313 | 315 | } |
314 | - if(0 == sieveModel.getZtfx()){ | |
315 | - diagnosisModel.setZtfx("0"); | |
316 | - diagnosisModel.setZtfeText("低风险"); | |
317 | - } | |
318 | - if(1 == sieveModel.getZtfx()){ | |
319 | - diagnosisModel.setZtfx("1"); | |
320 | - diagnosisModel.setZtfeText("临界值"); | |
321 | - } | |
322 | - if(2 == sieveModel.getZtfx()){ | |
323 | - diagnosisModel.setZtfx("2"); | |
324 | - diagnosisModel.setZtfeText("高风险"); | |
316 | + if(null != sieveModel.getZtfx()){ | |
317 | + if(0 == sieveModel.getZtfx()){ | |
318 | + diagnosisModel.setZtfx("0"); | |
319 | + diagnosisModel.setZtfeText("低风险"); | |
320 | + } | |
321 | + if(1 == sieveModel.getZtfx()){ | |
322 | + diagnosisModel.setZtfx("1"); | |
323 | + diagnosisModel.setZtfeText("临界值"); | |
324 | + } | |
325 | + if(2 == sieveModel.getZtfx()){ | |
326 | + diagnosisModel.setZtfx("2"); | |
327 | + diagnosisModel.setZtfeText("高风险"); | |
328 | + } | |
325 | 329 | } |
326 | 330 | } |
327 | 331 | } |