diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java index 1b3d508..e6954f5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java @@ -78,6 +78,16 @@ public class CervicalCancerModel extends BaseModel { private Date created; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getAddress() { return address; } 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 024b266..0bbcf9f 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 @@ -57,7 +57,7 @@ public class CervicalCancerController extends BaseController { @TokenRequired public BaseResponse add(@RequestBody CervicalCancerRequest param, HttpServletRequest request) { param.setCreateUser(getUserId(request).toString()); - return cervicalCancerService.add(param); + return cervicalCancerService.add(param,getUserId(request)); } /** @@ -82,8 +82,8 @@ public class CervicalCancerController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/listPage") @ResponseBody @TokenRequired - public BaseListResponse listPage(@JsonAlias CervicalCancerListRequest param) { - return cervicalCancerService.listPage(param); + public BaseListResponse listPage(@JsonAlias CervicalCancerListRequest param,HttpServletRequest request) { + return cervicalCancerService.listPage(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 0e08b86..638d9eb 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 @@ -57,7 +57,7 @@ public class DefectiveChildController extends BaseController { @TokenRequired public BaseResponse add(@RequestBody DefectiveChildRequest param, HttpServletRequest request) { param.setCreateUser(getUserId(request).toString()); - return defectiveChildService.add(param); + return defectiveChildService.add(param,getUserId(request)); } /** @@ -82,8 +82,8 @@ public class DefectiveChildController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/listPage") @ResponseBody @TokenRequired - public BaseListResponse listPage(@JsonAlias DefectiveChildListRequest param) { - return defectiveChildService.listPage(param); + public BaseListResponse listPage(@JsonAlias DefectiveChildListRequest param,HttpServletRequest request) { + return defectiveChildService.listPage(param,getUserId(request)); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index 1dab7b0..fa66fa2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -58,7 +58,7 @@ public class PreEugenicsBaseController extends BaseController { public BaseResponse add( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) { Integer userId = getUserId(request); param.setCreateUser(userId.toString()); - return iPreEugenicsService.add(param); + return iPreEugenicsService.add(param,getUserId(request)); } /** @@ -85,8 +85,8 @@ public class PreEugenicsBaseController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/listPage") @ResponseBody @TokenRequired - public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param) { - return iPreEugenicsService.listPage(param); + public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param,HttpServletRequest request) { + return iPreEugenicsService.listPage(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 aa66720..659c4f4 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 @@ -58,7 +58,7 @@ public class PregnantDeathController extends BaseController { @TokenRequired public BaseResponse add(@RequestBody PregnantDeathRequest param, HttpServletRequest request) { param.setCreateUser(getUserId(request).toString()); - return pregnantDeathServer.add(param); + return pregnantDeathServer.add(param,getUserId(request)); } /** @@ -83,8 +83,8 @@ public class PregnantDeathController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/listPage") @ResponseBody @TokenRequired - public BaseListResponse listPage(@JsonAlias PregnantDeathListRequest param) { - return pregnantDeathServer.listPage(param); + public BaseListResponse listPage(@JsonAlias PregnantDeathListRequest param,HttpServletRequest request) { + return pregnantDeathServer.listPage(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 22d32c0..00767e7 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 @@ -14,7 +14,7 @@ public interface IFormReportService { * @param param * @return */ - BaseResponse add(Q param); + BaseResponse add(Q param,Integer userId); /** * 编辑单个 @@ -30,7 +30,7 @@ public interface IFormReportService { * @param param * @return */ - BaseListResponse listPage(S param); + BaseListResponse listPage(S 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 e76225a..b87bd28 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.service.impl; import java.util.Date; import java.util.List; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -38,6 +39,9 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { @Autowired private BasicConfigService basicConfigService; + @Autowired + private AutoMatchFacade autoMatchFacade; + /** * 保存单个 * @@ -45,8 +49,9 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { * @return */ @Override - public BaseResponse add(CervicalCancerRequest param) { + public BaseResponse add(CervicalCancerRequest param,Integer userId) { param.setCreated(new Date()); + param.setHospitalId(autoMatchFacade.getHospitalId(userId)); mongoTemplate.insert(param); return new BaseResponse(); } @@ -73,7 +78,10 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { * @return */ @Override - public BaseListResponse listPage(CervicalCancerListRequest param) { + public BaseListResponse listPage(CervicalCancerListRequest param,Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + Query query = new Query(); String keyword = param.getKeyword(); if (StringUtils.isNotEmpty(keyword)) { @@ -87,6 +95,8 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { if (StringUtils.isNotEmpty(idCardNo)) { query.addCriteria(Criteria.where("idCardNo").is(idCardNo)); } + + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); String provinceId = param.getProvinceId(); if (StringUtils.isNotEmpty(provinceId)) { query.addCriteria(Criteria.where("provinceId").is(provinceId)); 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 b3c00ca..a9a9702 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 @@ -4,6 +4,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -53,6 +54,11 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { @Autowired private OrganizationService organizationService; + + @Autowired + private AutoMatchFacade autoMatchFacade; + + /** * 保存单个 * @@ -60,8 +66,9 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { * @return */ @Override - public BaseResponse add(DefectiveChildRequest param) { + public BaseResponse add(DefectiveChildRequest param,Integer userId) { DefectiveChildModel model = param; + model.setHospitalId(autoMatchFacade.getHospitalId(userId)); mongoTemplate.insert(model); return new BaseResponse(); } @@ -93,7 +100,9 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { * @return */ @Override - public BaseListResponse listPage(DefectiveChildListRequest param) { + public BaseListResponse listPage(DefectiveChildListRequest param,Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); Query query = new Query(); String createUser = param.getCreateUser(); if (StringUtils.isNotEmpty(createUser)) { @@ -106,10 +115,7 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { Date dayLastSecond = DateUtil.getDayLastSecond(DateUtil.parseYMD(endCreateTime)); query.addCriteria(Criteria.where("created").gte(dayFirstSecond).lte(dayLastSecond)); } - String hospitalId = param.getHospitalId(); - if (StringUtils.isNotEmpty(hospitalId)) { - query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); - } + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); String province = param.getProvince(); if (StringUtils.isNotEmpty(province)) { query.addCriteria(Criteria.where("province").is(province)); 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 e64c7e6..fcce531 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 @@ -5,6 +5,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.permission.service.UsersService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -43,6 +44,9 @@ import com.lyms.platform.pojo.ResidentsArchiveModel; public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugenicsService { @Autowired + private AutoMatchFacade autoMatchFacade; + + @Autowired private MongoTemplate mongoTemplate; @Autowired @@ -131,8 +135,10 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen * @return */ @Override - public BaseResponse add(PreEugenicsBaseRequest param) { + public BaseResponse add(PreEugenicsBaseRequest param,Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); PreEugenicsBaseModel model = param; + model.setHospitalId(hospitalId); model.setCreated(new Date()); mongoTemplate.insert(model); return new BaseResponse(); @@ -165,7 +171,9 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen * @return */ @Override - public BaseListResponse listPage(PreEugenicsBaseListRequest param) { + public BaseListResponse listPage(PreEugenicsBaseListRequest param,Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); Query query = new Query(); String searchType = param.getSearchType(); String idCardNo = param.getIdCardNo(); @@ -180,10 +188,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen String number = param.getNumber(); query = getQueryByNumber(query, searchType, number); - String hospitalId = param.getHospitalId(); - if (StringUtils.isNotEmpty(hospitalId)) { - query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); - } + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); String createUser = param.getCreateUser(); if (StringUtils.isNotEmpty(createUser)) { @@ -219,59 +224,30 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen String provinceId = param.getProvince(); if (StringUtils.isNotEmpty(provinceId)) { if ("1".equals(searchType)) { - - query.addCriteria(Criteria.where("husbandAccountCity").is(provinceId) - .orOperator(Criteria.where("husbandCurrentProvince").is(provinceId))); + query.addCriteria(Criteria.where("husbandCurrentProvince").is(provinceId)); } else if ("2".equals(searchType)) { - query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId) - .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId))); - } else { - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountProvince").is(provinceId) - ,(Criteria.where("husbandCurrentProvince").is(provinceId)) - ,(Criteria.where("wifeAccountProvince").is(provinceId)) - ,(Criteria.where("wifeCurrentProvince").is(provinceId)))); + query.addCriteria(Criteria.where("wifeCurrentProvince").is(provinceId)); } String cityId = param.getCity(); if (StringUtils.isNotEmpty(cityId)) { if ("1".equals(searchType)) { - query.addCriteria(Criteria.where("husbandAccountCity").is(cityId) - .orOperator(Criteria.where("husbandCurrentCity").is(cityId))); + query.addCriteria(Criteria.where("husbandCurrentCity").is(cityId)); } else if ("2".equals(searchType)) { - query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId) - .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId))); - } else { - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountCity").is(cityId) - ,(Criteria.where("husbandCurrentCity").is(cityId)) - ,(Criteria.where("wifeAccountCity").is(cityId)) - ,(Criteria.where("wifeCurrentCity").is(cityId)))); + query.addCriteria(Criteria.where("wifeCurrentCity").is(provinceId)); } String areaId = param.getArea(); if (StringUtils.isNotEmpty(areaId)) { if ("1".equals(searchType)) { - query.addCriteria(Criteria.where("husbandAccountArea").is(areaId) - .orOperator(Criteria.where("husbandCurrentArea").is(areaId))); + query.addCriteria(Criteria.where("husbandCurrentArea").is(areaId)); } else if ("2".equals(searchType)) { - query.addCriteria(Criteria.where("wifeAccountArea").is(areaId) - .orOperator(Criteria.where("wifeCurrentArea").is(areaId))); - } else { - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountArea").is(areaId) - ,(Criteria.where("husbandCurrentArea").is(areaId)) - ,(Criteria.where("wifeAccountArea").is(areaId)) - ,(Criteria.where("wifeCurrentArea").is(areaId)))); + query.addCriteria(Criteria.where("wifeCurrentArea").is(areaId)); } String streetId = param.getStreet(); if (StringUtils.isNotEmpty(streetId)) { if ("1".equals(searchType)) { - query.addCriteria(Criteria.where("husbandAccountStreet").is(streetId) - .orOperator(Criteria.where("husbandCurrentStreet").is(streetId))); + query.addCriteria(Criteria.where("husbandCurrentStreet").is(streetId)); } else if ("2".equals(searchType)) { - query.addCriteria(Criteria.where("wifeAccountStreet").is(streetId) - .orOperator(Criteria.where("wifeCurrentStreet").is(streetId)));; - } else { - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountStreet").is(streetId) - ,(Criteria.where("husbandCurrentStreet").is(streetId)) - ,(Criteria.where("wifeAccountStreet").is(streetId)) - ,(Criteria.where("wifeCurrentStreet").is(streetId)))); + query.addCriteria(Criteria.where("wifeCurrentStreet").is(streetId)); } } } 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 c77d3b5..02440e2 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 @@ -4,6 +4,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -51,6 +52,11 @@ public class PregnantDeathServerImpl implements IPregnantDeathServer { @Autowired private UsersService usersService; + + @Autowired + private AutoMatchFacade autoMatchFacade; + + /** * 保存单个 * @@ -58,8 +64,9 @@ public class PregnantDeathServerImpl implements IPregnantDeathServer { * @return */ @Override - public BaseResponse add(PregnantDeathRequest param) { + public BaseResponse add(PregnantDeathRequest param,Integer userId) { param.setCreated(new Date()); + param.setHospitalId(autoMatchFacade.getHospitalId(userId)); mongoTemplate.insert(param); return new BaseResponse(); } @@ -86,7 +93,10 @@ public class PregnantDeathServerImpl implements IPregnantDeathServer { * @return */ @Override - public BaseListResponse listPage(PregnantDeathListRequest param) { + public BaseListResponse listPage(PregnantDeathListRequest param,Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + Query query = new Query(); // 编号 String number = param.getNumber(); @@ -119,10 +129,8 @@ public class PregnantDeathServerImpl implements IPregnantDeathServer { query.addCriteria(Criteria.where("createUser").is(createUser)); } // 填写单位 - String hospitalId = param.getHospitalId(); - if (StringUtils.isNotEmpty(hospitalId)) { - query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); - } + + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); // 填写时间 String startCreated = param.getStartCreated(); String endCreated = param.getEndCreated();