Commit fb3b415c79a749ca2357ac570e9159072c96840d
1 parent
49dfc466db
Exists in
master
and in
1 other branch
修改新电子病历
Showing 2 changed files with 32 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
View file @
fb3b415
| ... | ... | @@ -85,7 +85,18 @@ |
| 85 | 85 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 86 | 86 | return sieveFacade.getOneChanQianDiaSieve(id/*,loginState.getId()*/); |
| 87 | 87 | } |
| 88 | - | |
| 88 | + /** | |
| 89 | + * 产前诊断 | |
| 90 | + * | |
| 91 | + * @return | |
| 92 | + */ | |
| 93 | + @ResponseBody | |
| 94 | + @RequestMapping(value = "/checkItem",method = RequestMethod.GET) | |
| 95 | + @TokenRequired | |
| 96 | + public BaseResponse getCheckItem(@RequestParam("parentId")String id,HttpServletRequest request) { | |
| 97 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 98 | + return sieveFacade.getCheckItem(id,loginState.getId()); | |
| 99 | + } | |
| 89 | 100 | |
| 90 | 101 | @ResponseBody |
| 91 | 102 | @RequestMapping(value = "/cqsieve/enums",method = RequestMethod.GET) |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
fb3b415
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.biz.service.AntenatalExaminationService; |
| 4 | +import com.lyms.platform.biz.service.ApplyOrderService; | |
| 4 | 5 | import com.lyms.platform.biz.service.PatientsService; |
| 5 | 6 | import com.lyms.platform.biz.service.SieveService; |
| 6 | 7 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| ... | ... | @@ -9,6 +10,7 @@ |
| 9 | 10 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 10 | 11 | import com.lyms.platform.common.result.BaseResponse; |
| 11 | 12 | import com.lyms.platform.common.utils.DateUtil; |
| 13 | +import com.lyms.platform.common.utils.JsonUtil; | |
| 12 | 14 | import com.lyms.platform.operate.web.request.ChanQianDiaAddRequest; |
| 13 | 15 | import com.lyms.platform.operate.web.request.CqSieveQueryRequest; |
| 14 | 16 | import com.lyms.platform.operate.web.request.SieveAddRequest; |
| ... | ... | @@ -18,10 +20,7 @@ |
| 18 | 20 | import com.lyms.platform.permission.model.Organization; |
| 19 | 21 | import com.lyms.platform.permission.service.OrganizationService; |
| 20 | 22 | import com.lyms.platform.pojo.*; |
| 21 | -import com.lyms.platform.query.AntExChuQuery; | |
| 22 | -import com.lyms.platform.query.AntExQuery; | |
| 23 | -import com.lyms.platform.query.SieveQuery; | |
| 24 | -import com.lyms.platform.query.SieveResultQuery; | |
| 23 | +import com.lyms.platform.query.*; | |
| 25 | 24 | import org.apache.commons.collections.CollectionUtils; |
| 26 | 25 | import org.apache.commons.lang.StringUtils; |
| 27 | 26 | import org.apache.commons.lang.math.NumberUtils; |
| ... | ... | @@ -50,6 +49,8 @@ |
| 50 | 49 | private AntenatalExaminationService antenatalExaminationService; |
| 51 | 50 | @Autowired |
| 52 | 51 | private OrganizationService organizationService; |
| 52 | + @Autowired | |
| 53 | + private ApplyOrderService applyOrderService; | |
| 53 | 54 | |
| 54 | 55 | /** |
| 55 | 56 | * 增加一条产筛结果记录 |
| ... | ... | @@ -90,7 +91,7 @@ |
| 90 | 91 | if(CollectionUtils.isNotEmpty(sb)){ |
| 91 | 92 | SieveResultModel sieveResultModel=sb.get(0); |
| 92 | 93 | // Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId()); |
| 93 | - sieveResult.convert(sieveResultModel,null); | |
| 94 | + sieveResult.convert(sieveResultModel, null); | |
| 94 | 95 | } |
| 95 | 96 | return new BaseObjectResponse().setData(sieveResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 96 | 97 | } |
| ... | ... | @@ -122,7 +123,20 @@ |
| 122 | 123 | } |
| 123 | 124 | return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); |
| 124 | 125 | } |
| 125 | - | |
| 126 | + public BaseResponse getCheckItem(String id,Integer userId) { | |
| 127 | + SieveApplyOrderQuery sieveQuery = new SieveApplyOrderQuery(); | |
| 128 | + sieveQuery.setYn(YnEnums.YES.getId()); | |
| 129 | + sieveQuery.setParentId(id); | |
| 130 | + String hospital = autoMatchFacade.getHospitalId(userId); | |
| 131 | + sieveQuery.setHospitalId(hospital); | |
| 132 | + List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveQuery); | |
| 133 | + List list = new ArrayList(); | |
| 134 | + if(CollectionUtils.isNotEmpty(applyOrderModels)) { | |
| 135 | + SieveApplyOrderModel sieveModel = applyOrderModels.get(0); | |
| 136 | + list=JsonUtil.jkstr2Obj(sieveModel.getCheckItem(), List.class) ; | |
| 137 | + } | |
| 138 | + return new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 139 | + } | |
| 126 | 140 | /** |
| 127 | 141 | * 产前诊断 |
| 128 | 142 | * |