Commit 65086d64253c88a55986c94ab13c18fd2acd3a9d
1 parent
c921abf27c
Exists in
master
and in
6 other branches
分娩记录导出
Showing 2 changed files with 11 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
65086d6
| ... | ... | @@ -399,11 +399,16 @@ |
| 399 | 399 | { |
| 400 | 400 | if (arrs[i] != null && StringUtils.isNumeric(arrs[i]) && Integer.parseInt(arrs[i]) >= 30) |
| 401 | 401 | { |
| 402 | - jcsc = "√"; | |
| 403 | - if (i != arrs.length -1) | |
| 404 | - { | |
| 405 | - jcsc += ","; | |
| 406 | - } | |
| 402 | + jcsc += "√"; | |
| 403 | + | |
| 404 | + } | |
| 405 | + else | |
| 406 | + { | |
| 407 | + jcsc += "-"; | |
| 408 | + } | |
| 409 | + if (i != arrs.length -1) | |
| 410 | + { | |
| 411 | + jcsc += ","; | |
| 407 | 412 | } |
| 408 | 413 | } |
| 409 | 414 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
View file @
65086d6
| ... | ... | @@ -178,7 +178,7 @@ |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | if (initQuery.contains("contactM")) { |
| 181 | - contactM+=babyModel.getContactM()+ ","; | |
| 181 | + contactM+=babyModel.getContactM() == null ? "-": babyModel.getContactM()+ ","; | |
| 182 | 182 | } |
| 183 | 183 | if (initQuery.contains("fmTime")) { |
| 184 | 184 | fmTime+= new SimpleDateFormat("HH:mm").format(babyModel.getBirth())+ ","; |