Commit 05f9d5e30a426bdf98a60b0fadbd1ad7ef0fca3b
1 parent
09b139e1e7
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 4 changed files with 80 additions and 3 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
View file @
05f9d5e
| ... | ... | @@ -11,6 +11,7 @@ |
| 11 | 11 | * Created by Administrator on 2016/6/23 0023. |
| 12 | 12 | */ |
| 13 | 13 | public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patients> { |
| 14 | + public static final String SPIT="-"; | |
| 14 | 15 | private String id; |
| 15 | 16 | //名称 |
| 16 | 17 | private String name; |
| ... | ... | @@ -42,6 +43,10 @@ |
| 42 | 43 | } |
| 43 | 44 | |
| 44 | 45 | public String getNextCheckTime() { |
| 46 | + | |
| 47 | + if(null==nextCheckTime){ | |
| 48 | + return SPIT; | |
| 49 | + } | |
| 45 | 50 | return nextCheckTime; |
| 46 | 51 | } |
| 47 | 52 | |
| ... | ... | @@ -58,6 +63,9 @@ |
| 58 | 63 | } |
| 59 | 64 | |
| 60 | 65 | public String getCheckDoctor() { |
| 66 | + if(null==checkDoctor){ | |
| 67 | + return SPIT; | |
| 68 | + } | |
| 61 | 69 | return checkDoctor; |
| 62 | 70 | } |
| 63 | 71 | |
| ... | ... | @@ -66,6 +74,9 @@ |
| 66 | 74 | } |
| 67 | 75 | |
| 68 | 76 | public String getcTime() { |
| 77 | + if(null==cTime){ | |
| 78 | + return SPIT; | |
| 79 | + } | |
| 69 | 80 | return cTime; |
| 70 | 81 | } |
| 71 | 82 | |
| ... | ... | @@ -83,6 +94,9 @@ |
| 83 | 94 | |
| 84 | 95 | |
| 85 | 96 | public String getDueWeek() { |
| 97 | + if(null==dueWeek){ | |
| 98 | + return SPIT; | |
| 99 | + } | |
| 86 | 100 | return dueWeek; |
| 87 | 101 | } |
| 88 | 102 | |
| ... | ... | @@ -99,7 +113,10 @@ |
| 99 | 113 | } |
| 100 | 114 | |
| 101 | 115 | public String getlName() { |
| 102 | - return lName; | |
| 116 | + | |
| 117 | + if(null==lName){ | |
| 118 | + return SPIT; | |
| 119 | + }return lName; | |
| 103 | 120 | } |
| 104 | 121 | |
| 105 | 122 | public void setlName(String lName) { |
| ... | ... | @@ -107,6 +124,9 @@ |
| 107 | 124 | } |
| 108 | 125 | |
| 109 | 126 | public String getName() { |
| 127 | + if(null==name){ | |
| 128 | + return SPIT; | |
| 129 | + } | |
| 110 | 130 | return name; |
| 111 | 131 | } |
| 112 | 132 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
View file @
05f9d5e
| ... | ... | @@ -15,6 +15,7 @@ |
| 15 | 15 | * Created by Administrator on 2016/6/23 0023. |
| 16 | 16 | */ |
| 17 | 17 | public class QuanPatientsResult implements IBasicResultConvert<QuanPatientsResult, Patients> { |
| 18 | + public static final String SPIT="-"; | |
| 18 | 19 | private String id; |
| 19 | 20 | //名称 |
| 20 | 21 | private String name; |
| ... | ... | @@ -59,6 +60,9 @@ |
| 59 | 60 | } |
| 60 | 61 | |
| 61 | 62 | public String getCheckDoctor() { |
| 63 | + if(null==checkDoctor){ | |
| 64 | + return SPIT; | |
| 65 | + } | |
| 62 | 66 | return checkDoctor; |
| 63 | 67 | } |
| 64 | 68 | |
| ... | ... | @@ -67,6 +71,10 @@ |
| 67 | 71 | } |
| 68 | 72 | |
| 69 | 73 | public String getcTime() { |
| 74 | + | |
| 75 | + if(null==cTime){ | |
| 76 | + return SPIT; | |
| 77 | + } | |
| 70 | 78 | return cTime; |
| 71 | 79 | } |
| 72 | 80 | |
| ... | ... | @@ -83,7 +91,10 @@ |
| 83 | 91 | } |
| 84 | 92 | |
| 85 | 93 | public String getDueDate() { |
| 86 | - return dueDate; | |
| 94 | + | |
| 95 | + if(null==dueDate){ | |
| 96 | + return SPIT; | |
| 97 | + }return dueDate; | |
| 87 | 98 | } |
| 88 | 99 | |
| 89 | 100 | public void setDueDate(String dueDate) { |
| ... | ... | @@ -91,6 +102,9 @@ |
| 91 | 102 | } |
| 92 | 103 | |
| 93 | 104 | public String getDueWeek() { |
| 105 | + if(null==dueWeek){ | |
| 106 | + return SPIT; | |
| 107 | + } | |
| 94 | 108 | return dueWeek; |
| 95 | 109 | } |
| 96 | 110 | |
| ... | ... | @@ -107,6 +121,10 @@ |
| 107 | 121 | } |
| 108 | 122 | |
| 109 | 123 | public String getlName() { |
| 124 | + | |
| 125 | + if(null==lName){ | |
| 126 | + return SPIT; | |
| 127 | + } | |
| 110 | 128 | return lName; |
| 111 | 129 | } |
| 112 | 130 | |
| ... | ... | @@ -115,6 +133,9 @@ |
| 115 | 133 | } |
| 116 | 134 | |
| 117 | 135 | public String getName() { |
| 136 | + if(null==name){ | |
| 137 | + return SPIT; | |
| 138 | + } | |
| 118 | 139 | return name; |
| 119 | 140 | } |
| 120 | 141 | |
| ... | ... | @@ -131,6 +152,9 @@ |
| 131 | 152 | } |
| 132 | 153 | |
| 133 | 154 | public String getrLevel() { |
| 155 | + if(null==rLevel){ | |
| 156 | + return SPIT; | |
| 157 | + } | |
| 134 | 158 | return rLevel; |
| 135 | 159 | } |
| 136 | 160 | |
| ... | ... | @@ -139,6 +163,9 @@ |
| 139 | 163 | } |
| 140 | 164 | |
| 141 | 165 | public String getServiceType() { |
| 166 | + if(null==serviceType){ | |
| 167 | + return SPIT; | |
| 168 | + } | |
| 142 | 169 | return serviceType; |
| 143 | 170 | } |
| 144 | 171 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
View file @
05f9d5e
| ... | ... | @@ -18,6 +18,8 @@ |
| 18 | 18 | * Created by Administrator on 2016/6/22 0022. |
| 19 | 19 | */ |
| 20 | 20 | public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResult, Patients> { |
| 21 | + public static final String SPIT="-"; | |
| 22 | + | |
| 21 | 23 | //孕妇 |
| 22 | 24 | private String id; |
| 23 | 25 | //孕妇名字 |
| ... | ... | @@ -74,6 +76,10 @@ |
| 74 | 76 | |
| 75 | 77 | |
| 76 | 78 | public String getcTime() { |
| 79 | + if(null==cTime){ | |
| 80 | + return SPIT; | |
| 81 | + } | |
| 82 | + | |
| 77 | 83 | return cTime; |
| 78 | 84 | } |
| 79 | 85 | |
| ... | ... | @@ -82,6 +88,9 @@ |
| 82 | 88 | } |
| 83 | 89 | |
| 84 | 90 | public String getDueWeek() { |
| 91 | + if(null==dueWeek){ | |
| 92 | + return SPIT; | |
| 93 | + } | |
| 85 | 94 | return dueWeek; |
| 86 | 95 | } |
| 87 | 96 | |
| ... | ... | @@ -109,6 +118,10 @@ |
| 109 | 118 | } |
| 110 | 119 | |
| 111 | 120 | public String getPhone() { |
| 121 | + | |
| 122 | + if(null==phone){ | |
| 123 | + return SPIT; | |
| 124 | + } | |
| 112 | 125 | return phone; |
| 113 | 126 | } |
| 114 | 127 | |
| ... | ... | @@ -117,6 +130,9 @@ |
| 117 | 130 | } |
| 118 | 131 | |
| 119 | 132 | public String getrFactor() { |
| 133 | + if(null==rFactor){ | |
| 134 | + return SPIT; | |
| 135 | + } | |
| 120 | 136 | return rFactor; |
| 121 | 137 | } |
| 122 | 138 | |
| ... | ... | @@ -125,6 +141,9 @@ |
| 125 | 141 | } |
| 126 | 142 | |
| 127 | 143 | public String getrLevel() { |
| 144 | + if(null==rLevel){ | |
| 145 | + return SPIT; | |
| 146 | + } | |
| 128 | 147 | return rLevel; |
| 129 | 148 | } |
| 130 | 149 | |
| ... | ... | @@ -133,6 +152,10 @@ |
| 133 | 152 | } |
| 134 | 153 | |
| 135 | 154 | public String getCheckDoctor() { |
| 155 | + | |
| 156 | + if(null==checkDoctor){ | |
| 157 | + return SPIT; | |
| 158 | + } | |
| 136 | 159 | return checkDoctor; |
| 137 | 160 | } |
| 138 | 161 | |
| ... | ... | @@ -149,6 +172,10 @@ |
| 149 | 172 | } |
| 150 | 173 | |
| 151 | 174 | public String getDueDate() { |
| 175 | + | |
| 176 | + if(null==dueDate){ | |
| 177 | + return SPIT; | |
| 178 | + } | |
| 152 | 179 | return dueDate; |
| 153 | 180 | } |
| 154 | 181 | |
| ... | ... | @@ -157,6 +184,9 @@ |
| 157 | 184 | } |
| 158 | 185 | |
| 159 | 186 | public String getlName() { |
| 187 | + if(null==lName){ | |
| 188 | + return SPIT; | |
| 189 | + } | |
| 160 | 190 | return lName; |
| 161 | 191 | } |
| 162 | 192 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
View file @
05f9d5e
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | * Created by Administrator on 2016/7/5 0005. |
| 16 | 16 | */ |
| 17 | 17 | public class SieveListResult implements IBasicResultConvert<SieveListResult, SieveModel> { |
| 18 | - private static final String SPIT="-"; | |
| 18 | + public static final String SPIT="-"; | |
| 19 | 19 | |
| 20 | 20 | private String id; |
| 21 | 21 | //患者id |