Commit c34245d59b12d87a5cfe5e231b2ef7985ce2d67b
1 parent
1d58b354cd
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 4 additions and 74 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
View file @
c34245d
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | public class SieveResult { |
| 18 | 18 | |
| 19 | 19 | |
| 20 | - | |
| 20 | +/* | |
| 21 | 21 | //名字 |
| 22 | 22 | private String name; |
| 23 | 23 | //年龄 |
| ... | ... | @@ -35,7 +35,7 @@ |
| 35 | 35 | //备注 |
| 36 | 36 | private String remarks; |
| 37 | 37 | //末次月经 |
| 38 | - private String lastMenses; | |
| 38 | + private String lastMenses;*/ | |
| 39 | 39 | private String id; |
| 40 | 40 | private String parentId; |
| 41 | 41 | |
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | |
| ... | ... | @@ -111,80 +111,10 @@ |
| 111 | 111 | this.tszhz = tszhz; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - public Integer getAge() { | |
| 115 | - return age; | |
| 116 | - } | |
| 117 | 114 | |
| 118 | - public void setAge(Integer age) { | |
| 119 | - this.age = age; | |
| 120 | - } | |
| 121 | 115 | |
| 122 | - public String getDueWeek() { | |
| 123 | - return dueWeek; | |
| 124 | - } | |
| 125 | - | |
| 126 | - public void setDueWeek(String dueWeek) { | |
| 127 | - this.dueWeek = dueWeek; | |
| 128 | - } | |
| 129 | - | |
| 130 | - public String getLastMenses() { | |
| 131 | - return lastMenses; | |
| 132 | - } | |
| 133 | - | |
| 134 | - public void setLastMenses(String lastMenses) { | |
| 135 | - this.lastMenses = lastMenses; | |
| 136 | - } | |
| 137 | - | |
| 138 | - public String getName() { | |
| 139 | - return name; | |
| 140 | - } | |
| 141 | - | |
| 142 | - public void setName(String name) { | |
| 143 | - this.name = name; | |
| 144 | - } | |
| 145 | - | |
| 146 | - public String getPhone() { | |
| 147 | - return phone; | |
| 148 | - } | |
| 149 | - | |
| 150 | - public void setPhone(String phone) { | |
| 151 | - this.phone = phone; | |
| 152 | - } | |
| 153 | - | |
| 154 | - public String getRemarks() { | |
| 155 | - return remarks; | |
| 156 | - } | |
| 157 | - | |
| 158 | - public void setRemarks(String remarks) { | |
| 159 | - this.remarks = remarks; | |
| 160 | - } | |
| 161 | - | |
| 162 | - public List getRiskFactor() { | |
| 163 | - return riskFactor; | |
| 164 | - } | |
| 165 | - | |
| 166 | - public void setRiskFactor(List riskFactor) { | |
| 167 | - this.riskFactor = riskFactor; | |
| 168 | - } | |
| 169 | - | |
| 170 | - public String getRiskScore() { | |
| 171 | - return riskScore; | |
| 172 | - } | |
| 173 | - | |
| 174 | - public void setRiskScore(String riskScore) { | |
| 175 | - this.riskScore = riskScore; | |
| 176 | - } | |
| 177 | - | |
| 178 | - public String getyChanQi() { | |
| 179 | - return yChanQi; | |
| 180 | - } | |
| 181 | - | |
| 182 | - public void setyChanQi(String yChanQi) { | |
| 183 | - this.yChanQi = yChanQi; | |
| 184 | - } | |
| 185 | - | |
| 186 | 116 | public SieveResult convert(SieveResultModel sieveResultModel,Patients patients){ |
| 187 | - try { | |
| 117 | + /* try { | |
| 188 | 118 | if(null!=patients.getBirth()){ |
| 189 | 119 | setAge(DateUtil.getAge(patients.getBirth())); |
| 190 | 120 | } |
| ... | ... | @@ -202,7 +132,7 @@ |
| 202 | 132 | this.dueWeek= StringUtils.dueWeek(days); |
| 203 | 133 | if(null!=patients.getLastMenses()){ |
| 204 | 134 | setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); |
| 205 | - } | |
| 135 | + }*/ | |
| 206 | 136 | setParentId(sieveResultModel.getParentId()); |
| 207 | 137 | setId(sieveResultModel.getId()); |
| 208 | 138 | setCspj(sieveResultModel.getCspj()); |