Commit 6ae5c73814ea7640fc72957ed42232950e7fc55c
1 parent
68ef7b51b9
Exists in
master
and in
1 other branch
产检增加流产相关字段
Showing 3 changed files with 65 additions and 2 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
View file @
6ae5c73
| ... | ... | @@ -104,7 +104,12 @@ |
| 104 | 104 | private String bp; |
| 105 | 105 | //丈夫健康情况 |
| 106 | 106 | private String hHealthInfo; |
| 107 | - | |
| 107 | + //引产 | |
| 108 | + private String yinchan; | |
| 109 | + //宫外孕 | |
| 110 | + private String gongwaiyun; | |
| 111 | + //药物流产次数 | |
| 112 | + private String yaowu; | |
| 108 | 113 | //自然流产 |
| 109 | 114 | private Integer abortionZR; |
| 110 | 115 | //人工流产 |
| ... | ... | @@ -180,6 +185,30 @@ |
| 180 | 185 | |
| 181 | 186 | public String getHospitalId() { |
| 182 | 187 | return hospitalId; |
| 188 | + } | |
| 189 | + | |
| 190 | + public String getYinchan() { | |
| 191 | + return yinchan; | |
| 192 | + } | |
| 193 | + | |
| 194 | + public void setYinchan(String yinchan) { | |
| 195 | + this.yinchan = yinchan; | |
| 196 | + } | |
| 197 | + | |
| 198 | + public String getGongwaiyun() { | |
| 199 | + return gongwaiyun; | |
| 200 | + } | |
| 201 | + | |
| 202 | + public void setGongwaiyun(String gongwaiyun) { | |
| 203 | + this.gongwaiyun = gongwaiyun; | |
| 204 | + } | |
| 205 | + | |
| 206 | + public String getYaowu() { | |
| 207 | + return yaowu; | |
| 208 | + } | |
| 209 | + | |
| 210 | + public void setYaowu(String yaowu) { | |
| 211 | + this.yaowu = yaowu; | |
| 183 | 212 | } |
| 184 | 213 | |
| 185 | 214 | public void setHospitalId(String hospitalId) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
6ae5c73
| ... | ... | @@ -282,6 +282,9 @@ |
| 282 | 282 | //孕妇基本信息 |
| 283 | 283 | map.put("id", data.getId()); |
| 284 | 284 | map.put("neoDeathTodo", data.getNeoDeathTodo()); |
| 285 | + map.put("yinchan", data.getYinchan()); | |
| 286 | + map.put("gongwaiyun", data.getGongwaiyun()); | |
| 287 | + map.put("yaowu", data.getYaowu()); | |
| 285 | 288 | map.put("birthDefectTodo", data.getBirthDefectTodo()); |
| 286 | 289 | map.put("diagnosisOther", data.getDiagnosisOther()); |
| 287 | 290 | map.put("username", patients.getUsername()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
View file @
6ae5c73
| ... | ... | @@ -191,7 +191,12 @@ |
| 191 | 191 | private String ydqjd; |
| 192 | 192 | //实验结果 |
| 193 | 193 | private String syjg; |
| 194 | - | |
| 194 | + //引产 | |
| 195 | + private String yinchan; | |
| 196 | + //宫外孕 | |
| 197 | + private String gongwaiyun; | |
| 198 | + //药物流产次数 | |
| 199 | + private String yaowu; | |
| 195 | 200 | //自然流产 |
| 196 | 201 | private Integer abortionZR; |
| 197 | 202 | //人工流产 |
| 198 | 203 | |
| ... | ... | @@ -250,7 +255,30 @@ |
| 250 | 255 | this.couponType = couponType; |
| 251 | 256 | } |
| 252 | 257 | |
| 258 | + public String getYinchan() { | |
| 259 | + return yinchan; | |
| 260 | + } | |
| 253 | 261 | |
| 262 | + public void setYinchan(String yinchan) { | |
| 263 | + this.yinchan = yinchan; | |
| 264 | + } | |
| 265 | + | |
| 266 | + public String getGongwaiyun() { | |
| 267 | + return gongwaiyun; | |
| 268 | + } | |
| 269 | + | |
| 270 | + public void setGongwaiyun(String gongwaiyun) { | |
| 271 | + this.gongwaiyun = gongwaiyun; | |
| 272 | + } | |
| 273 | + | |
| 274 | + public String getYaowu() { | |
| 275 | + return yaowu; | |
| 276 | + } | |
| 277 | + | |
| 278 | + public void setYaowu(String yaowu) { | |
| 279 | + this.yaowu = yaowu; | |
| 280 | + } | |
| 281 | + | |
| 254 | 282 | public String getBarCode() { |
| 255 | 283 | return barCode; |
| 256 | 284 | } |
| ... | ... | @@ -947,6 +975,9 @@ |
| 947 | 975 | @Override |
| 948 | 976 | public AntExChuModel convertToDataModel() { |
| 949 | 977 | AntExChuModel antExChuModel=new AntExChuModel(); |
| 978 | + antExChuModel.setYinchan(yinchan); | |
| 979 | + antExChuModel.setGongwaiyun(gongwaiyun); | |
| 980 | + antExChuModel.setYaowu(yaowu); | |
| 950 | 981 | antExChuModel.setNeoDeathTodo(neoDeathTodo); |
| 951 | 982 | antExChuModel.setBirthDefectTodo(birthDefectTodo); |
| 952 | 983 | antExChuModel.setDiagnosisOther(diagnosisOther); |