diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java index 0bbcf9f..023e8bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java @@ -41,8 +41,8 @@ public class CervicalCancerController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard") @ResponseBody @TokenRequired - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param) { - return cervicalCancerService.getPatientInfoByIdCard(param); + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) { + return cervicalCancerService.getPatientInfoByIdCard(param,getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java index 638d9eb..10fbccf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java @@ -41,8 +41,8 @@ public class DefectiveChildController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard") @ResponseBody @TokenRequired - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param) { - return defectiveChildService.getPatientInfoByIdCard(param); + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) { + return defectiveChildService.getPatientInfoByIdCard(param,getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantDeathController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantDeathController.java index 659c4f4..15195d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantDeathController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantDeathController.java @@ -42,8 +42,8 @@ public class PregnantDeathController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard") @ResponseBody @TokenRequired - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param) { - return pregnantDeathServer.getPatientInfoByIdCard(param); + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) { + return pregnantDeathServer.getPatientInfoByIdCard(param,getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java index 00767e7..69470cd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java @@ -46,5 +46,5 @@ public interface IFormReportService { * @param param 检索的条件 * @return */ - BaseResponse getPatientInfoByIdCard(CommonParamRequest param); + BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index b87bd28..e47a934 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -153,7 +153,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { * @return */ @Override - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) { + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) { String cardNo = param.getCardNo(); if (StringUtils.isEmpty(cardNo)) { return new BaseResponse("参数缺失",ErrorCodeConstants.PARAMETER_ERROR); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java index a9a9702..7c9fa66 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java @@ -252,7 +252,7 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { * @return */ @Override - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) { + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) { String inHospitalId = param.getCardNo(); List results = new LinkedList<>(); if (StringUtils.isNotEmpty(inHospitalId)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index fcce531..bb5b163 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -62,7 +62,8 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen * @return */ @Override - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) { + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); String cardNo = param.getCardNo(); Query query = new Query(); if (StringUtils.isNotEmpty(cardNo)) { @@ -72,6 +73,8 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (StringUtils.isNotEmpty(otherNo)) { query.addCriteria(new Criteria().orOperator(Criteria.where("husbandNo").is(otherNo), Criteria.where("wifeNo").is(otherNo))); } + + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); String code = param.getCode(); if (StringUtils.isNotEmpty(otherNo)) { query.addCriteria(Criteria.where("code").is(code)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PregnantDeathServerImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PregnantDeathServerImpl.java index 02440e2..289e21a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PregnantDeathServerImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PregnantDeathServerImpl.java @@ -254,7 +254,7 @@ public class PregnantDeathServerImpl implements IPregnantDeathServer { * @return */ @Override - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param) { + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) { String cardNo = param.getCardNo(); Query query = new Query(); if (StringUtils.isNotEmpty(cardNo)) {