Commit 73f7cad2029eabde86e56f313f98d6b3f7d68e25
1 parent
98e0759adc
Exists in
master
and in
8 other branches
增加设置parentid
Showing 3 changed files with 13 additions and 14 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
View file @
73f7cad
| ... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 | //预产期 |
| 39 | 39 | private Date dueDate; |
| 40 | 40 | //高危分级 |
| 41 | - private String rLevel; | |
| 41 | + private List<String> rLevel; | |
| 42 | 42 | //高危风险因素 |
| 43 | 43 | private List<String> rRisk; |
| 44 | 44 | //高危评分 |
| 45 | 45 | |
| ... | ... | @@ -210,11 +210,11 @@ |
| 210 | 210 | this.received = received; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - public String getrLevel() { | |
| 213 | + public List<String> getrLevel() { | |
| 214 | 214 | return rLevel; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - public void setrLevel(String rLevel) { | |
| 217 | + public void setrLevel(List<String> rLevel) { | |
| 218 | 218 | this.rLevel = rLevel; |
| 219 | 219 | } |
| 220 | 220 |
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
View file @
73f7cad
| ... | ... | @@ -196,7 +196,7 @@ |
| 196 | 196 | condition=condition.and("score",score, MongoOper.IS); |
| 197 | 197 | } |
| 198 | 198 | if(null!=riskFactor){ |
| 199 | - condition=condition.and("riskFactor",riskFactor, MongoOper.IS); | |
| 199 | + condition=condition.and("riskFactor",riskFactor, MongoOper.IN); | |
| 200 | 200 | } |
| 201 | 201 | if(StringUtils.isNotEmpty(cardNo)){ |
| 202 | 202 | condition=condition.and("cardNo",cardNo, MongoOper.IS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
73f7cad
| ... | ... | @@ -36,6 +36,8 @@ |
| 36 | 36 | */ |
| 37 | 37 | @Component |
| 38 | 38 | public class ApplyOrderFacade { |
| 39 | + | |
| 40 | + | |
| 39 | 41 | @Autowired |
| 40 | 42 | private ApplyOrderService applyOrderService; |
| 41 | 43 | @Autowired |
| 42 | 44 | |
| ... | ... | @@ -56,9 +58,8 @@ |
| 56 | 58 | private UsersService usersService; |
| 57 | 59 | @Autowired |
| 58 | 60 | private BasicConfigService basicConfigService; |
| 61 | + | |
| 59 | 62 | @Autowired |
| 60 | - private BabyBookbuildingService babyBookbuildingService; | |
| 61 | - @Autowired | |
| 62 | 63 | private BabyCheckFacade babyCheckFacade; |
| 63 | 64 | |
| 64 | 65 | /** |
| ... | ... | @@ -86,8 +87,7 @@ |
| 86 | 87 | organizationQuery.setName(referralApplyOrderModel.getTransferredHospital()); |
| 87 | 88 | List<Organization> organization = organizationService.queryOrganization(organizationQuery); |
| 88 | 89 | if (CollectionUtils.isNotEmpty(organization)) { |
| 89 | - referralApplyOrderModel.setTransferredHospital(organization | |
| 90 | - .get(0).getId() + ""); | |
| 90 | + referralApplyOrderModel.setTransferredHospital(organization.get(0).getId() + ""); | |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | |
| ... | ... | @@ -113,7 +113,10 @@ |
| 113 | 113 | referralApplyOrderModel.setBirth(patients.getBirth()); |
| 114 | 114 | referralApplyOrderModel.setExpVip(patients.getExpVip()); |
| 115 | 115 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
| 116 | - | |
| 116 | + HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(patients.getPid(), true); | |
| 117 | + referralApplyOrderModel.setrRisk(highScoreResult.getHighRisk()); | |
| 118 | + referralApplyOrderModel.setScore(highScoreResult.getScore()); | |
| 119 | + referralApplyOrderModel.setrLevel(highScoreResult.getLevel()); | |
| 117 | 120 | referralApplyOrderModel.setPid(patients.getPid()); |
| 118 | 121 | referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); |
| 119 | 122 | if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { |
| ... | ... | @@ -363,10 +366,6 @@ |
| 363 | 366 | } |
| 364 | 367 | } |
| 365 | 368 | |
| 366 | - /* BabyModelQuery babyModelQuery=new BabyModelQuery(); | |
| 367 | - babyModelQuery.setId(applyOrderModel.getParentId()); | |
| 368 | - babyModelQuery.setYn(YnEnums.YES.getId()); | |
| 369 | - List<BabyModel> babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);*/ | |
| 370 | 369 | babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); |
| 371 | 370 | List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); |
| 372 | 371 | String diagnose = ""; |
| ... | ... | @@ -412,7 +411,7 @@ |
| 412 | 411 | referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital()); |
| 413 | 412 | referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); |
| 414 | 413 | referralApplyOrderQuery.setType(applyOrderQueryRequest.getType()); |
| 415 | - | |
| 414 | + referralApplyOrderQuery.setNeed("1"); | |
| 416 | 415 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 417 | 416 | referralApplyOrderQuery.setHospitalId(hospital); |
| 418 | 417 | referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); |