Commit c9c1902f616c82fe4cf666f91d430bdbedf42692
1 parent
2e3a291276
Exists in
master
and in
8 other branches
修改新电子病历
Showing 2 changed files with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
c9c1902
| ... | ... | @@ -1096,7 +1096,7 @@ |
| 1096 | 1096 | if(null!=patients){ |
| 1097 | 1097 | return new BaseResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); |
| 1098 | 1098 | } |
| 1099 | - | |
| 1099 | + | |
| 1100 | 1100 | return new BaseResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("该孕妇还未在本院建档不能进行产检"); |
| 1101 | 1101 | } |
| 1102 | 1102 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
c9c1902
| ... | ... | @@ -456,13 +456,14 @@ |
| 456 | 456 | } else if (null == patients) { |
| 457 | 457 | return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); |
| 458 | 458 | } |
| 459 | + | |
| 459 | 460 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
| 460 | 461 | |
| 461 | 462 | if (days < 168 && patients.getFmDate() == null) { |
| 462 | 463 | return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周,不能进行分娩"); |
| 463 | 464 | } |
| 464 | 465 | if(null!=patients.getDueStatus() && 1 == patients.getDueStatus()){ |
| 465 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("您已终止妊娠不能进行分娩"); | |
| 466 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg(" 该孕妇在系统中已终止妊娠不能再进行分娩,请重新建档"); | |
| 466 | 467 | } |
| 467 | 468 | |
| 468 | 469 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |