Commit fc3559ee3cf3df292f717ec5a32cd74de29cb68f
1 parent
fa9b0ba39d
Exists in
master
and in
6 other branches
分娩报告卡导出
Showing 1 changed file with 13 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
fc3559e
| ... | ... | @@ -341,8 +341,16 @@ |
| 341 | 341 | map.put("yc",""); |
| 342 | 342 | map.put("cc",""); |
| 343 | 343 | }*/ |
| 344 | - map.put("yc",queryModel.getGravidity()); | |
| 345 | - map.put("cc",queryModel.getDueCount()); | |
| 344 | + if(null == queryModel.getGravidity()){ | |
| 345 | + map.put("yc",""); | |
| 346 | + }else{ | |
| 347 | + map.put("yc",queryModel.getGravidity()); | |
| 348 | + } | |
| 349 | + if(null == queryModel.getDueCount()){ | |
| 350 | + map.put("cc",""); | |
| 351 | + }else{ | |
| 352 | + map.put("cc",queryModel.getDueCount()); | |
| 353 | + } | |
| 346 | 354 | map.put("week",queryModel.getDueWeek()); |
| 347 | 355 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); |
| 348 | 356 | //妊娠期高危因素 |
| ... | ... | @@ -350,9 +358,8 @@ |
| 350 | 358 | String a = ""; |
| 351 | 359 | String m = ""; |
| 352 | 360 | String y = ""; |
| 353 | - /*Map<String,Object> amy = new HashMap<String,Object>(); | |
| 354 | - amy = queryModel.getMyzd(); | |
| 355 | - if(!amy.isEmpty()){ | |
| 361 | + Map<String,Object> amy = queryModel.getMyzd(); | |
| 362 | + if(null != amy && amy.size() > 0){ | |
| 356 | 363 | if(true == (boolean)amy.get("0")){ |
| 357 | 364 | a = "√"; |
| 358 | 365 | } |
| ... | ... | @@ -364,7 +371,7 @@ |
| 364 | 371 | if(true == (boolean)amy.get("2")){ |
| 365 | 372 | y = "√"; |
| 366 | 373 | } |
| 367 | - }*/ | |
| 374 | + } | |
| 368 | 375 | map.put("A",a); |
| 369 | 376 | map.put("M",m); |
| 370 | 377 | map.put("Y",y); |