Commit bd5d0a970055c57a47af0f224497a9e25f101cd8
1 parent
5ec8e36535
Exists in
master
and in
6 other branches
威海分娩记录修改
Showing 4 changed files with 65 additions and 0 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
View file @
bd5d0a9
| ... | ... | @@ -1758,6 +1758,25 @@ |
| 1758 | 1758 | private String gongjing;//宫颈(0:无破;1:撕裂;2:其他) |
| 1759 | 1759 | private String gjOther;//宫颈其它; |
| 1760 | 1760 | |
| 1761 | + private String bedNum;//床号 | |
| 1762 | + private String bhNum;//住院号 | |
| 1763 | + | |
| 1764 | + public String getBedNum() { | |
| 1765 | + return bedNum; | |
| 1766 | + } | |
| 1767 | + | |
| 1768 | + public void setBedNum(String bedNum) { | |
| 1769 | + this.bedNum = bedNum; | |
| 1770 | + } | |
| 1771 | + | |
| 1772 | + public String getBhNum() { | |
| 1773 | + return bhNum; | |
| 1774 | + } | |
| 1775 | + | |
| 1776 | + public void setBhNum(String bhNum) { | |
| 1777 | + this.bhNum = bhNum; | |
| 1778 | + } | |
| 1779 | + | |
| 1761 | 1780 | public Integer getParity() { |
| 1762 | 1781 | return parity; |
| 1763 | 1782 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
bd5d0a9
| ... | ... | @@ -2779,6 +2779,8 @@ |
| 2779 | 2779 | map.put("totalTwoCxl",data.getTotalTwoCxl()); |
| 2780 | 2780 | map.put("gongjing", data.getGongjing()); |
| 2781 | 2781 | map.put("gjOther",data.getGjOther()); |
| 2782 | + map.put("bedNum",data.getBedNum()); | |
| 2783 | + map.put("bhNum",data.getBhNum()); | |
| 2782 | 2784 | |
| 2783 | 2785 | /* 产后生理 */ |
| 2784 | 2786 | map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
View file @
bd5d0a9
| ... | ... | @@ -340,7 +340,10 @@ |
| 340 | 340 | private String gongjing;//宫颈(0:无破;1:撕裂;2:其他) |
| 341 | 341 | private String gjOther;//宫颈其它; |
| 342 | 342 | |
| 343 | + private String bedNum;//床号 | |
| 344 | + private String bhNum;//住院号 | |
| 343 | 345 | |
| 346 | + | |
| 344 | 347 | @Override |
| 345 | 348 | public MaternalDeliverModel convertToDataModel() { |
| 346 | 349 | MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel(); |
| 347 | 350 | |
| ... | ... | @@ -417,7 +420,26 @@ |
| 417 | 420 | maternalDeliverModel.setGongjing(gongjing); |
| 418 | 421 | maternalDeliverModel.setGjOther(gjOther); |
| 419 | 422 | |
| 423 | + maternalDeliverModel.setBedNum(bedNum); | |
| 424 | + maternalDeliverModel.setBhNum(bhNum); | |
| 425 | + | |
| 420 | 426 | return maternalDeliverModel; |
| 427 | + } | |
| 428 | + | |
| 429 | + public String getBedNum() { | |
| 430 | + return bedNum; | |
| 431 | + } | |
| 432 | + | |
| 433 | + public void setBedNum(String bedNum) { | |
| 434 | + this.bedNum = bedNum; | |
| 435 | + } | |
| 436 | + | |
| 437 | + public String getBhNum() { | |
| 438 | + return bhNum; | |
| 439 | + } | |
| 440 | + | |
| 441 | + public void setBhNum(String bhNum) { | |
| 442 | + this.bhNum = bhNum; | |
| 421 | 443 | } |
| 422 | 444 | |
| 423 | 445 | public Integer getParity() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
View file @
bd5d0a9
| ... | ... | @@ -139,6 +139,25 @@ |
| 139 | 139 | private String gongjing;//宫颈(0:无破;1:撕裂;2:其他) |
| 140 | 140 | private String gjOther;//宫颈其它; |
| 141 | 141 | |
| 142 | + private String bedNum;//床号 | |
| 143 | + private String bhNum;//住院号 | |
| 144 | + | |
| 145 | + public String getBedNum() { | |
| 146 | + return bedNum; | |
| 147 | + } | |
| 148 | + | |
| 149 | + public void setBedNum(String bedNum) { | |
| 150 | + this.bedNum = bedNum; | |
| 151 | + } | |
| 152 | + | |
| 153 | + public String getBhNum() { | |
| 154 | + return bhNum; | |
| 155 | + } | |
| 156 | + | |
| 157 | + public void setBhNum(String bhNum) { | |
| 158 | + this.bhNum = bhNum; | |
| 159 | + } | |
| 160 | + | |
| 142 | 161 | public String getPgcCxl() { |
| 143 | 162 | return pgcCxl; |
| 144 | 163 | } |
| ... | ... | @@ -409,6 +428,9 @@ |
| 409 | 428 | setTotalTwoCxl(destModel.getTotalTwoCxl()); |
| 410 | 429 | setGongjing(destModel.getGongjing()); |
| 411 | 430 | setGjOther(destModel.getGjOther()); |
| 431 | + | |
| 432 | + setBedNum(destModel.getBedNum()); | |
| 433 | + setBhNum(destModel.getBhNum()); | |
| 412 | 434 | |
| 413 | 435 | return this; |
| 414 | 436 | } |