Commit 128ad373df699ad0c967af7024719eb7037da687
1 parent
e9580ec2d7
Exists in
master
and in
7 other branches
大小写问题
Showing 3 changed files with 23 additions and 20 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
128ad37
| ... | ... | @@ -2,7 +2,6 @@ |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.biz.service.*; |
| 4 | 4 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 5 | -import com.lyms.platform.common.constants.TimeConstants; | |
| 6 | 5 | import com.lyms.platform.common.enums.*; |
| 7 | 6 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 8 | 7 | import com.lyms.platform.common.result.BaseResponse; |
| ... | ... | @@ -1085,7 +1084,7 @@ |
| 1085 | 1084 | patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId()); |
| 1086 | 1085 | patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); |
| 1087 | 1086 | patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo()); |
| 1088 | - patientsQuery.setFmHospitalQueryList(hospitalList); | |
| 1087 | + // patientsQuery.setFmHospitalQueryList(hospitalList); | |
| 1089 | 1088 | String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); |
| 1090 | 1089 | patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson); |
| 1091 | 1090 | patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge())); |
| ... | ... | @@ -1282,6 +1281,10 @@ |
| 1282 | 1281 | childbirthManagerQueryModel.setLoseBloodCause(""); |
| 1283 | 1282 | } |
| 1284 | 1283 | } |
| 1284 | + // 1/2/24小时失血量 | |
| 1285 | + childbirthManagerQueryModel.setOhloseBloodL(maternalDeliverModel.getsHloseBloodL()); | |
| 1286 | + childbirthManagerQueryModel.setThloseBloodL(maternalDeliverModel.gettHloseBloodL()); | |
| 1287 | + childbirthManagerQueryModel.setRhloseBloodL(maternalDeliverModel.getrHloseBloodL()); | |
| 1285 | 1288 | |
| 1286 | 1289 | // 查询分娩方式 |
| 1287 | 1290 | childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
View file @
128ad37
| ... | ... | @@ -392,9 +392,9 @@ |
| 392 | 392 | initQueryMap.put("chBpSzy1", "舒张压"); |
| 393 | 393 | initQueryMap.put("breath", "呼吸"); |
| 394 | 394 | initQueryMap.put("pulse", "脉搏"); |
| 395 | - initQueryMap.put("oHloseBloodL", "产后1小时失血量"); | |
| 396 | - initQueryMap.put("tHloseBloodL", "产后2小时失血量"); | |
| 397 | - initQueryMap.put("rHloseBloodL", "产后24小时内失血量"); | |
| 395 | + initQueryMap.put("ohloseBloodL", "产后1小时失血量"); | |
| 396 | + initQueryMap.put("thloseBloodL", "产后2小时失血量"); | |
| 397 | + initQueryMap.put("rhloseBloodL", "产后24小时内失血量"); | |
| 398 | 398 | initQueryMap.put("loseBloodCause", "失血原因"); |
| 399 | 399 | initQueryMap.put("tpmcType", "胎盘娩出方式"); |
| 400 | 400 | initQueryMap.put("tpSize", "胎盘大小"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
View file @
128ad37
| ... | ... | @@ -236,21 +236,21 @@ |
| 236 | 236 | * @createTime 2016年12月09日 15时54分 |
| 237 | 237 | * @discription 产后1小时失血量 |
| 238 | 238 | */ |
| 239 | - private Double oHloseBloodL; | |
| 239 | + private Double ohloseBloodL; | |
| 240 | 240 | |
| 241 | 241 | /** |
| 242 | 242 | * @auther HuJiaqi |
| 243 | 243 | * @createTime 2016年12月09日 15时54分 |
| 244 | 244 | * @discription 产后2小时失血量 |
| 245 | 245 | */ |
| 246 | - private Double tHloseBloodL; | |
| 246 | + private Double thloseBloodL; | |
| 247 | 247 | |
| 248 | 248 | /** |
| 249 | 249 | * @auther HuJiaqi |
| 250 | 250 | * @createTime 2016年12月09日 15时54分 |
| 251 | 251 | * @discription 产后24小时内失血量 |
| 252 | 252 | */ |
| 253 | - private Double rHloseBloodL; | |
| 253 | + private Double rhloseBloodL; | |
| 254 | 254 | |
| 255 | 255 | /** |
| 256 | 256 | * @auther HuJiaqi |
| 257 | 257 | |
| 258 | 258 | |
| 259 | 259 | |
| 260 | 260 | |
| 261 | 261 | |
| ... | ... | @@ -656,28 +656,28 @@ |
| 656 | 656 | this.pulse = pulse; |
| 657 | 657 | } |
| 658 | 658 | |
| 659 | - public Double getoHloseBloodL() { | |
| 660 | - return oHloseBloodL; | |
| 659 | + public Double getOhloseBloodL() { | |
| 660 | + return ohloseBloodL; | |
| 661 | 661 | } |
| 662 | 662 | |
| 663 | - public void setoHloseBloodL(Double oHloseBloodL) { | |
| 664 | - this.oHloseBloodL = oHloseBloodL; | |
| 663 | + public void setOhloseBloodL(Double ohloseBloodL) { | |
| 664 | + this.ohloseBloodL = ohloseBloodL; | |
| 665 | 665 | } |
| 666 | 666 | |
| 667 | - public Double gettHloseBloodL() { | |
| 668 | - return tHloseBloodL; | |
| 667 | + public Double getThloseBloodL() { | |
| 668 | + return thloseBloodL; | |
| 669 | 669 | } |
| 670 | 670 | |
| 671 | - public void settHloseBloodL(Double tHloseBloodL) { | |
| 672 | - this.tHloseBloodL = tHloseBloodL; | |
| 671 | + public void setThloseBloodL(Double thloseBloodL) { | |
| 672 | + this.thloseBloodL = thloseBloodL; | |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | - public Double getrHloseBloodL() { | |
| 676 | - return rHloseBloodL; | |
| 675 | + public Double getRhloseBloodL() { | |
| 676 | + return rhloseBloodL; | |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | - public void setrHloseBloodL(Double rHloseBloodL) { | |
| 680 | - this.rHloseBloodL = rHloseBloodL; | |
| 679 | + public void setRhloseBloodL(Double rhloseBloodL) { | |
| 680 | + this.rhloseBloodL = rhloseBloodL; | |
| 681 | 681 | } |
| 682 | 682 | |
| 683 | 683 | public String getLoseBloodCause() { |