jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c46e3b9765de390cc4ec6c879b7374ca4eb43ec1

Authored by liquanyu
1 parent 89a3a8f979
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 8 changed files with 14 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java View file @ c46e3b9
... ... @@ -41,8 +41,8 @@
41 41 @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard")
42 42 @ResponseBody
43 43 @TokenRequired
44   - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param) {
45   - return cervicalCancerService.getPatientInfoByIdCard(param);
  44 + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) {
  45 + return cervicalCancerService.getPatientInfoByIdCard(param,getUserId(request));
46 46 }
47 47  
48 48  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java View file @ c46e3b9
... ... @@ -41,8 +41,8 @@
41 41 @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard")
42 42 @ResponseBody
43 43 @TokenRequired
44   - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param) {
45   - return defectiveChildService.getPatientInfoByIdCard(param);
  44 + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) {
  45 + return defectiveChildService.getPatientInfoByIdCard(param,getUserId(request));
46 46 }
47 47  
48 48  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantDeathController.java View file @ c46e3b9
... ... @@ -42,8 +42,8 @@
42 42 @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard")
43 43 @ResponseBody
44 44 @TokenRequired
45   - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param) {
46   - return pregnantDeathServer.getPatientInfoByIdCard(param);
  45 + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) {
  46 + return pregnantDeathServer.getPatientInfoByIdCard(param,getUserId(request));
47 47 }
48 48  
49 49  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java View file @ c46e3b9
... ... @@ -46,6 +46,6 @@
46 46 * @param param 检索的条件
47 47 * @return
48 48 */
49   - BaseResponse getPatientInfoByIdCard(CommonParamRequest param);
  49 + BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId);
50 50 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ c46e3b9
... ... @@ -153,7 +153,7 @@
153 153 * @return
154 154 */
155 155 @Override
156   - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) {
  156 + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
157 157 String cardNo = param.getCardNo();
158 158 if (StringUtils.isEmpty(cardNo)) {
159 159 return new BaseResponse("参数缺失",ErrorCodeConstants.PARAMETER_ERROR);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java View file @ c46e3b9
... ... @@ -252,7 +252,7 @@
252 252 * @return
253 253 */
254 254 @Override
255   - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) {
  255 + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
256 256 String inHospitalId = param.getCardNo();
257 257 List<DefectiveChildModelResult> results = new LinkedList<>();
258 258 if (StringUtils.isNotEmpty(inHospitalId)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ c46e3b9
... ... @@ -62,7 +62,8 @@
62 62 * @return
63 63 */
64 64 @Override
65   - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) {
  65 + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
  66 + String hospitalId = autoMatchFacade.getHospitalId(userId);
66 67 String cardNo = param.getCardNo();
67 68 Query query = new Query();
68 69 if (StringUtils.isNotEmpty(cardNo)) {
... ... @@ -72,6 +73,8 @@
72 73 if (StringUtils.isNotEmpty(otherNo)) {
73 74 query.addCriteria(new Criteria().orOperator(Criteria.where("husbandNo").is(otherNo), Criteria.where("wifeNo").is(otherNo)));
74 75 }
  76 +
  77 + query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
75 78 String code = param.getCode();
76 79 if (StringUtils.isNotEmpty(otherNo)) {
77 80 query.addCriteria(Criteria.where("code").is(code));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PregnantDeathServerImpl.java View file @ c46e3b9
... ... @@ -254,7 +254,7 @@
254 254 * @return
255 255 */
256 256 @Override
257   - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) {
  257 + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
258 258 String cardNo = param.getCardNo();
259 259 Query query = new Query();
260 260 if (StringUtils.isNotEmpty(cardNo)) {