Commit 2dc448d18de6fc6559acbcf3fd29b96afcb38de4
1 parent
3feaade468
Exists in
master
and in
6 other branches
威海分娩打印修改
Showing 1 changed file with 9 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
2dc448d
| ... | ... | @@ -511,13 +511,15 @@ |
| 511 | 511 | //queryModel.getTireNumber()-queryModel.getLivingNumber() |
| 512 | 512 | map.put("sc",queryModel.getPregnancyOut());//死产 |
| 513 | 513 | |
| 514 | + int bn = 0; | |
| 514 | 515 | String jcsc = ""; |
| 515 | 516 | if (queryModel.getContactM() != null && queryModel.getContactM().contains(",")) |
| 516 | 517 | { |
| 518 | + bn = 1; | |
| 517 | 519 | String[] arrs = queryModel.getContactM().split(","); |
| 518 | 520 | for (int i = 0 ;i < arrs.length ; i++) |
| 519 | 521 | { |
| 520 | - if (StringUtils.isNotEmpty(arrs[i])) | |
| 522 | + if ("1".equals(arrs[i])) | |
| 521 | 523 | { |
| 522 | 524 | jcsc += "√"; |
| 523 | 525 | |
| ... | ... | @@ -532,7 +534,12 @@ |
| 532 | 534 | } |
| 533 | 535 | } |
| 534 | 536 | } |
| 535 | - map.put("jzsx",queryModel.getContactM());//皮肤接触及早吸吮≥30分钟 | |
| 537 | + if(bn == 0 && !"-".equals(queryModel.getContactM())){ | |
| 538 | + jcsc += "√"; | |
| 539 | + }else if(bn == 0 && "-".equals(queryModel.getContactM())){ | |
| 540 | + jcsc += queryModel.getContactM(); | |
| 541 | + } | |
| 542 | + map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟 | |
| 536 | 543 | map.put("xj","-");//宣教 |
| 537 | 544 | map.put("jsz",queryModel.getDeliverDoctor());//接生者 |
| 538 | 545 | //科室 |