Commit 71f2e06f63ac17bef32fd1fe9afde9d08222ab33
1 parent
a2a0cba143
Exists in
master
and in
1 other branch
产妇增加字段
Showing 2 changed files with 24 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
View file @
71f2e06
| ... | ... | @@ -69,7 +69,7 @@ |
| 69 | 69 | //第3产层+产后失血量 |
| 70 | 70 | private String sHloseBloodL; |
| 71 | 71 | //失血原因 |
| 72 | - private String loseBloodCause; | |
| 72 | + private java.util.Map loseBloodCause; | |
| 73 | 73 | //产科并发症 |
| 74 | 74 | private java.util.Map ocs; |
| 75 | 75 | |
| ... | ... | @@ -114,7 +114,7 @@ |
| 114 | 114 | maternalDeliverModel.settHloseBloodL(tHloseBloodL); |
| 115 | 115 | maternalDeliverModel.setrHloseBloodL(rHloseBloodL); |
| 116 | 116 | maternalDeliverModel.setsHloseBloodL(sHloseBloodL); |
| 117 | - maternalDeliverModel.setLoseBloodCause(loseBloodCause); | |
| 117 | + maternalDeliverModel.setLoseBloodCause(JsonUtil.obj2JsonString(loseBloodCause)); | |
| 118 | 118 | maternalDeliverModel.setOcs(JsonUtil.obj2JsonString(ocs)); |
| 119 | 119 | /*maternalDeliverModel.setTpmcType(tpmcType); |
| 120 | 120 | maternalDeliverModel.setMcType(mcType); |
| 121 | 121 | |
| 122 | 122 | |
| ... | ... | @@ -178,12 +178,20 @@ |
| 178 | 178 | this.id = id; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - public String getLoseBloodCause() { | |
| 181 | + public Map getLoseBloodCause() { | |
| 182 | 182 | return loseBloodCause; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - public void setLoseBloodCause(String loseBloodCause) { | |
| 185 | + public void setLoseBloodCause(Map loseBloodCause) { | |
| 186 | 186 | this.loseBloodCause = loseBloodCause; |
| 187 | + } | |
| 188 | + | |
| 189 | + public void setSiLielevel(Integer siLielevel) { | |
| 190 | + this.siLielevel = siLielevel; | |
| 191 | + } | |
| 192 | + | |
| 193 | + public void setTireNumber(Integer tireNumber) { | |
| 194 | + this.tireNumber = tireNumber; | |
| 187 | 195 | } |
| 188 | 196 | |
| 189 | 197 | public String getMaternalInfo() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
View file @
71f2e06
| ... | ... | @@ -63,7 +63,7 @@ |
| 63 | 63 | //第3产层+产后失血量 |
| 64 | 64 | private String sHloseBloodL; |
| 65 | 65 | //失血原因 |
| 66 | - private String loseBloodCause; | |
| 66 | + private Map loseBloodCause; | |
| 67 | 67 | //产科并发症 |
| 68 | 68 | private Map ocs; |
| 69 | 69 | private List<MaternalDeliverModel.ExtPlacenta> extPlacentas; |
| ... | ... | @@ -101,7 +101,7 @@ |
| 101 | 101 | settHloseBloodL(destModel.gettHloseBloodL()); |
| 102 | 102 | setrHloseBloodL(destModel.getrHloseBloodL()); |
| 103 | 103 | setsHloseBloodL(destModel.getsHloseBloodL()); |
| 104 | - setLoseBloodCause(destModel.getLoseBloodCause()); | |
| 104 | + setLoseBloodCause(JsonUtil.str2Obj(destModel.getLoseBloodCause(),Map.class)); | |
| 105 | 105 | setOcs(JsonUtil.str2Obj(destModel.getOcs(),Map.class)); |
| 106 | 106 | setExtPlacentas(destModel.getExtPlacentas()); |
| 107 | 107 | setFmHospital(destModel.getFmHospital()); |
| 108 | 108 | |
| 109 | 109 | |
| ... | ... | @@ -363,12 +363,20 @@ |
| 363 | 363 | this.id = id; |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | - public String getLoseBloodCause() { | |
| 366 | + public Map getLoseBloodCause() { | |
| 367 | 367 | return loseBloodCause; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - public void setLoseBloodCause(String loseBloodCause) { | |
| 370 | + public void setLoseBloodCause(Map loseBloodCause) { | |
| 371 | 371 | this.loseBloodCause = loseBloodCause; |
| 372 | + } | |
| 373 | + | |
| 374 | + public void setSiLielevel(Integer siLielevel) { | |
| 375 | + this.siLielevel = siLielevel; | |
| 376 | + } | |
| 377 | + | |
| 378 | + public void setTireNumber(Integer tireNumber) { | |
| 379 | + this.tireNumber = tireNumber; | |
| 372 | 380 | } |
| 373 | 381 | |
| 374 | 382 | public String getMaternalInfo() { |