Commit c00909562087de4f60f1ba1d48ba95c786024ab0
1 parent
b4d96b6016
Exists in
master
and in
8 other branches
修改新电子病历
Showing 2 changed files with 38 additions and 0 deletions
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
View file @
c009095
| ... | ... | @@ -59,6 +59,7 @@ |
| 59 | 59 | //体验会员 0非会员 1会员 |
| 60 | 60 | private Integer expVip; |
| 61 | 61 | private Integer serviceType; |
| 62 | + private Integer status; | |
| 62 | 63 | /** |
| 63 | 64 | * 生日 |
| 64 | 65 | */ |
| ... | ... | @@ -86,6 +87,14 @@ |
| 86 | 87 | */ |
| 87 | 88 | private Date lastMensesEnd; |
| 88 | 89 | |
| 90 | + public Integer getStatus() { | |
| 91 | + return status; | |
| 92 | + } | |
| 93 | + | |
| 94 | + public void setStatus(Integer status) { | |
| 95 | + this.status = status; | |
| 96 | + } | |
| 97 | + | |
| 89 | 98 | public Date getRevicedEnd() { |
| 90 | 99 | return revicedEnd; |
| 91 | 100 | } |
| ... | ... | @@ -295,6 +304,9 @@ |
| 295 | 304 | } |
| 296 | 305 | if(null!=serviceStatus){ |
| 297 | 306 | condition=condition.and("serviceStatus",serviceStatus, MongoOper.IS); |
| 307 | + } | |
| 308 | + if(null!=status){ | |
| 309 | + condition=condition.and("status",status, MongoOper.IS); | |
| 298 | 310 | } |
| 299 | 311 | if(null!=age){ |
| 300 | 312 | condition=condition.and("age",age, MongoOper.IS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
c009095
| ... | ... | @@ -97,6 +97,31 @@ |
| 97 | 97 | updateApplyOrder(model, antExAddRequest.getParentId()); |
| 98 | 98 | //修改孕妇高危等级 |
| 99 | 99 | updatePatientRiskLevel(model, patients); |
| 100 | + | |
| 101 | + | |
| 102 | + if (null != patients.getBuildType() && patients.getBuildType() == 3) { | |
| 103 | + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); | |
| 104 | + referralApplyOrderQuery.setParentId(patients.getId()); | |
| 105 | + String hospital = autoMatchFacade.getHospitalId(userId); | |
| 106 | + referralApplyOrderQuery.setHospitalId(hospital); | |
| 107 | + referralApplyOrderQuery.setStatus(1); | |
| 108 | + List<ReferralApplyOrderModel> orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); | |
| 109 | + if (CollectionUtils.isNotEmpty(orderModelList)) { | |
| 110 | + String outHospitalId = orderModelList.get(0).getOutHospitalId(); | |
| 111 | + ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); | |
| 112 | + referralApplyOrderQuery1.setOutHospitalId(outHospitalId); | |
| 113 | + referralApplyOrderQuery1.setTransferredHospital(hospital); | |
| 114 | + referralApplyOrderQuery1.setPid(patients.getPid()); | |
| 115 | + | |
| 116 | + ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); | |
| 117 | + //设置接收时间 | |
| 118 | + model1.setReceived(new Date()); | |
| 119 | + model1.setRecDoctor(userId + ""); | |
| 120 | + model1.setModified(new Date()); | |
| 121 | + model1.setStatus(2); | |
| 122 | + applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); | |
| 123 | + } | |
| 124 | + } | |
| 100 | 125 | } |
| 101 | 126 | |
| 102 | 127 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| ... | ... | @@ -172,6 +197,7 @@ |
| 172 | 197 | referralApplyOrderQuery.setParentId(patients.getId()); |
| 173 | 198 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 174 | 199 | referralApplyOrderQuery.setHospitalId(hospital); |
| 200 | + referralApplyOrderQuery.setStatus(1); | |
| 175 | 201 | List<ReferralApplyOrderModel> orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |
| 176 | 202 | if (CollectionUtils.isNotEmpty(orderModelList)) { |
| 177 | 203 | String outHospitalId = orderModelList.get(0).getOutHospitalId(); |