Commit 6c7ef1ffefcf93faf18ece377ab9638842547452
1 parent
482b5fe58a
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 23 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
6c7ef1f
| ... | ... | @@ -908,21 +908,33 @@ |
| 908 | 908 | map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI)); |
| 909 | 909 | //流产 |
| 910 | 910 | StringBuffer abortion = new StringBuffer(); |
| 911 | - abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI)); | |
| 912 | - abortion.append("（"); | |
| 911 | + if (data.getAbortion() == null) | |
| 912 | + { | |
| 913 | + boolean isAppend = false; | |
| 914 | + abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI)); | |
| 915 | + if (data.getAbortionZR() != null || data.getAbortionRG() != null || data.getYaowu() != null) | |
| 916 | + { | |
| 917 | + isAppend = true; | |
| 918 | + abortion.append("（"); | |
| 919 | + } | |
| 920 | + if (data.getAbortionZR() != null) { | |
| 921 | + abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI); | |
| 922 | + } | |
| 913 | 923 | |
| 914 | - if (data.getAbortionZR() != null) { | |
| 915 | - abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI); | |
| 916 | - } | |
| 924 | + if (data.getAbortionRG() != null) { | |
| 925 | + abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + ""); | |
| 926 | + } | |
| 917 | 927 | |
| 918 | - if (data.getAbortionRG() != null) { | |
| 919 | - abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + ""); | |
| 920 | - } | |
| 928 | + if (data.getYaowu() != null) { | |
| 929 | + abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + ""); | |
| 930 | + } | |
| 931 | + if (isAppend) | |
| 932 | + { | |
| 933 | + abortion.append("）"); | |
| 934 | + } | |
| 921 | 935 | |
| 922 | - if (data.getYaowu() != null) { | |
| 923 | - abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + ""); | |
| 924 | 936 | } |
| 925 | - abortion.append("）"); | |
| 937 | + | |
| 926 | 938 | |
| 927 | 939 | map.put("abortion", abortion); |
| 928 | 940 | /*map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + |