jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 89a3a8f979b739743f670dfd17c5b2fabf84d3b0

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

update

Showing 10 changed files with 81 additions and 71 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java View file @ 89a3a8f
... ... @@ -78,6 +78,16 @@
78 78  
79 79 private Date created;
80 80  
  81 + private String hospitalId;
  82 +
  83 + public String getHospitalId() {
  84 + return hospitalId;
  85 + }
  86 +
  87 + public void setHospitalId(String hospitalId) {
  88 + this.hospitalId = hospitalId;
  89 + }
  90 +
81 91 public String getAddress() {
82 92 return address;
83 93 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java View file @ 89a3a8f
... ... @@ -57,7 +57,7 @@
57 57 @TokenRequired
58 58 public BaseResponse add(@RequestBody CervicalCancerRequest param, HttpServletRequest request) {
59 59 param.setCreateUser(getUserId(request).toString());
60   - return cervicalCancerService.add(param);
  60 + return cervicalCancerService.add(param,getUserId(request));
61 61 }
62 62  
63 63 /**
... ... @@ -82,8 +82,8 @@
82 82 @RequestMapping(method = RequestMethod.GET, value = "/listPage")
83 83 @ResponseBody
84 84 @TokenRequired
85   - public BaseListResponse listPage(@JsonAlias CervicalCancerListRequest param) {
86   - return cervicalCancerService.listPage(param);
  85 + public BaseListResponse listPage(@JsonAlias CervicalCancerListRequest param,HttpServletRequest request) {
  86 + return cervicalCancerService.listPage(param,getUserId(request));
87 87 }
88 88  
89 89 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java View file @ 89a3a8f
... ... @@ -57,7 +57,7 @@
57 57 @TokenRequired
58 58 public BaseResponse add(@RequestBody DefectiveChildRequest param, HttpServletRequest request) {
59 59 param.setCreateUser(getUserId(request).toString());
60   - return defectiveChildService.add(param);
  60 + return defectiveChildService.add(param,getUserId(request));
61 61 }
62 62  
63 63 /**
... ... @@ -82,8 +82,8 @@
82 82 @RequestMapping(method = RequestMethod.GET, value = "/listPage")
83 83 @ResponseBody
84 84 @TokenRequired
85   - public BaseListResponse listPage(@JsonAlias DefectiveChildListRequest param) {
86   - return defectiveChildService.listPage(param);
  85 + public BaseListResponse listPage(@JsonAlias DefectiveChildListRequest param,HttpServletRequest request) {
  86 + return defectiveChildService.listPage(param,getUserId(request));
87 87 }
88 88  
89 89 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java View file @ 89a3a8f
... ... @@ -58,7 +58,7 @@
58 58 public BaseResponse add( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) {
59 59 Integer userId = getUserId(request);
60 60 param.setCreateUser(userId.toString());
61   - return iPreEugenicsService.add(param);
  61 + return iPreEugenicsService.add(param,getUserId(request));
62 62 }
63 63  
64 64 /**
... ... @@ -85,8 +85,8 @@
85 85 @RequestMapping(method = RequestMethod.GET, value = "/listPage")
86 86 @ResponseBody
87 87 @TokenRequired
88   - public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param) {
89   - return iPreEugenicsService.listPage(param);
  88 + public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param,HttpServletRequest request) {
  89 + return iPreEugenicsService.listPage(param,getUserId(request));
90 90 }
91 91  
92 92 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantDeathController.java View file @ 89a3a8f
... ... @@ -58,7 +58,7 @@
58 58 @TokenRequired
59 59 public BaseResponse add(@RequestBody PregnantDeathRequest param, HttpServletRequest request) {
60 60 param.setCreateUser(getUserId(request).toString());
61   - return pregnantDeathServer.add(param);
  61 + return pregnantDeathServer.add(param,getUserId(request));
62 62 }
63 63  
64 64 /**
... ... @@ -83,8 +83,8 @@
83 83 @RequestMapping(method = RequestMethod.GET, value = "/listPage")
84 84 @ResponseBody
85 85 @TokenRequired
86   - public BaseListResponse listPage(@JsonAlias PregnantDeathListRequest param) {
87   - return pregnantDeathServer.listPage(param);
  86 + public BaseListResponse listPage(@JsonAlias PregnantDeathListRequest param,HttpServletRequest request) {
  87 + return pregnantDeathServer.listPage(param,getUserId(request));
88 88 }
89 89  
90 90 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java View file @ 89a3a8f
... ... @@ -14,7 +14,7 @@
14 14 * @param param
15 15 * @return
16 16 */
17   - BaseResponse add(Q param);
  17 + BaseResponse add(Q param,Integer userId);
18 18  
19 19 /**
20 20 * 编辑单个
... ... @@ -30,7 +30,7 @@
30 30 * @param param
31 31 * @return
32 32 */
33   - BaseListResponse listPage(S param);
  33 + BaseListResponse listPage(S param,Integer userId);
34 34  
35 35 /**
36 36 * 单个查询
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 89a3a8f
... ... @@ -3,6 +3,7 @@
3 3 import java.util.Date;
4 4 import java.util.List;
5 5  
  6 +import com.lyms.platform.operate.web.facade.AutoMatchFacade;
6 7 import org.springframework.beans.BeanUtils;
7 8 import org.springframework.beans.factory.annotation.Autowired;
8 9 import org.springframework.data.domain.Sort;
... ... @@ -38,6 +39,9 @@
38 39 @Autowired
39 40 private BasicConfigService basicConfigService;
40 41  
  42 + @Autowired
  43 + private AutoMatchFacade autoMatchFacade;
  44 +
41 45 /**
42 46 * 保存单个
43 47 *
44 48  
... ... @@ -45,8 +49,9 @@
45 49 * @return
46 50 */
47 51 @Override
48   - public BaseResponse add(CervicalCancerRequest param) {
  52 + public BaseResponse add(CervicalCancerRequest param,Integer userId) {
49 53 param.setCreated(new Date());
  54 + param.setHospitalId(autoMatchFacade.getHospitalId(userId));
50 55 mongoTemplate.insert(param);
51 56 return new BaseResponse();
52 57 }
... ... @@ -73,7 +78,10 @@
73 78 * @return
74 79 */
75 80 @Override
76   - public BaseListResponse listPage(CervicalCancerListRequest param) {
  81 + public BaseListResponse listPage(CervicalCancerListRequest param,Integer userId) {
  82 +
  83 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  84 +
77 85 Query query = new Query();
78 86 String keyword = param.getKeyword();
79 87 if (StringUtils.isNotEmpty(keyword)) {
... ... @@ -87,6 +95,8 @@
87 95 if (StringUtils.isNotEmpty(idCardNo)) {
88 96 query.addCriteria(Criteria.where("idCardNo").is(idCardNo));
89 97 }
  98 +
  99 + query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
90 100 String provinceId = param.getProvinceId();
91 101 if (StringUtils.isNotEmpty(provinceId)) {
92 102 query.addCriteria(Criteria.where("provinceId").is(provinceId));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java View file @ 89a3a8f
... ... @@ -4,6 +4,7 @@
4 4 import java.util.LinkedList;
5 5 import java.util.List;
6 6  
  7 +import com.lyms.platform.operate.web.facade.AutoMatchFacade;
7 8 import org.springframework.beans.BeanUtils;
8 9 import org.springframework.beans.factory.annotation.Autowired;
9 10 import org.springframework.data.domain.Sort;
... ... @@ -53,6 +54,11 @@
53 54 @Autowired
54 55 private OrganizationService organizationService;
55 56  
  57 +
  58 + @Autowired
  59 + private AutoMatchFacade autoMatchFacade;
  60 +
  61 +
56 62 /**
57 63 * 保存单个
58 64 *
59 65  
... ... @@ -60,8 +66,9 @@
60 66 * @return
61 67 */
62 68 @Override
63   - public BaseResponse add(DefectiveChildRequest param) {
  69 + public BaseResponse add(DefectiveChildRequest param,Integer userId) {
64 70 DefectiveChildModel model = param;
  71 + model.setHospitalId(autoMatchFacade.getHospitalId(userId));
65 72 mongoTemplate.insert(model);
66 73 return new BaseResponse();
67 74 }
... ... @@ -93,7 +100,9 @@
93 100 * @return
94 101 */
95 102 @Override
96   - public BaseListResponse listPage(DefectiveChildListRequest param) {
  103 + public BaseListResponse listPage(DefectiveChildListRequest param,Integer userId) {
  104 +
  105 + String hospitalId = autoMatchFacade.getHospitalId(userId);
97 106 Query query = new Query();
98 107 String createUser = param.getCreateUser();
99 108 if (StringUtils.isNotEmpty(createUser)) {
... ... @@ -106,10 +115,7 @@
106 115 Date dayLastSecond = DateUtil.getDayLastSecond(DateUtil.parseYMD(endCreateTime));
107 116 query.addCriteria(Criteria.where("created").gte(dayFirstSecond).lte(dayLastSecond));
108 117 }
109   - String hospitalId = param.getHospitalId();
110   - if (StringUtils.isNotEmpty(hospitalId)) {
111   - query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
112   - }
  118 + query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
113 119 String province = param.getProvince();
114 120 if (StringUtils.isNotEmpty(province)) {
115 121 query.addCriteria(Criteria.where("province").is(province));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 89a3a8f
... ... @@ -5,6 +5,7 @@
5 5 import java.util.List;
6 6 import java.util.Map;
7 7  
  8 +import com.lyms.platform.operate.web.facade.AutoMatchFacade;
8 9 import com.lyms.platform.permission.service.UsersService;
9 10 import org.springframework.beans.BeanUtils;
10 11 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -43,6 +44,9 @@
43 44 public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugenicsService {
44 45  
45 46 @Autowired
  47 + private AutoMatchFacade autoMatchFacade;
  48 +
  49 + @Autowired
46 50 private MongoTemplate mongoTemplate;
47 51  
48 52 @Autowired
49 53  
... ... @@ -131,8 +135,10 @@
131 135 * @return
132 136 */
133 137 @Override
134   - public BaseResponse add(PreEugenicsBaseRequest param) {
  138 + public BaseResponse add(PreEugenicsBaseRequest param,Integer userId) {
  139 + String hospitalId = autoMatchFacade.getHospitalId(userId);
135 140 PreEugenicsBaseModel model = param;
  141 + model.setHospitalId(hospitalId);
136 142 model.setCreated(new Date());
137 143 mongoTemplate.insert(model);
138 144 return new BaseResponse();
... ... @@ -165,7 +171,9 @@
165 171 * @return
166 172 */
167 173 @Override
168   - public BaseListResponse listPage(PreEugenicsBaseListRequest param) {
  174 + public BaseListResponse listPage(PreEugenicsBaseListRequest param,Integer userId) {
  175 +
  176 + String hospitalId = autoMatchFacade.getHospitalId(userId);
169 177 Query query = new Query();
170 178 String searchType = param.getSearchType();
171 179 String idCardNo = param.getIdCardNo();
... ... @@ -180,10 +188,7 @@
180 188 String number = param.getNumber();
181 189 query = getQueryByNumber(query, searchType, number);
182 190  
183   - String hospitalId = param.getHospitalId();
184   - if (StringUtils.isNotEmpty(hospitalId)) {
185   - query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
186   - }
  191 + query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
187 192  
188 193 String createUser = param.getCreateUser();
189 194 if (StringUtils.isNotEmpty(createUser)) {
190 195  
191 196  
192 197  
193 198  
194 199  
195 200  
196 201  
... ... @@ -219,59 +224,30 @@
219 224 String provinceId = param.getProvince();
220 225 if (StringUtils.isNotEmpty(provinceId)) {
221 226 if ("1".equals(searchType)) {
222   -
223   - query.addCriteria(Criteria.where("husbandAccountCity").is(provinceId)
224   - .orOperator(Criteria.where("husbandCurrentProvince").is(provinceId)));
  227 + query.addCriteria(Criteria.where("husbandCurrentProvince").is(provinceId));
225 228 } else if ("2".equals(searchType)) {
226   - query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId)
227   - .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId)));
228   - } else {
229   - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountProvince").is(provinceId)
230   - ,(Criteria.where("husbandCurrentProvince").is(provinceId))
231   - ,(Criteria.where("wifeAccountProvince").is(provinceId))
232   - ,(Criteria.where("wifeCurrentProvince").is(provinceId))));
  229 + query.addCriteria(Criteria.where("wifeCurrentProvince").is(provinceId));
233 230 }
234 231 String cityId = param.getCity();
235 232 if (StringUtils.isNotEmpty(cityId)) {
236 233 if ("1".equals(searchType)) {
237   - query.addCriteria(Criteria.where("husbandAccountCity").is(cityId)
238   - .orOperator(Criteria.where("husbandCurrentCity").is(cityId)));
  234 + query.addCriteria(Criteria.where("husbandCurrentCity").is(cityId));
239 235 } else if ("2".equals(searchType)) {
240   - query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId)
241   - .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId)));
242   - } else {
243   - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountCity").is(cityId)
244   - ,(Criteria.where("husbandCurrentCity").is(cityId))
245   - ,(Criteria.where("wifeAccountCity").is(cityId))
246   - ,(Criteria.where("wifeCurrentCity").is(cityId))));
  236 + query.addCriteria(Criteria.where("wifeCurrentCity").is(provinceId));
247 237 }
248 238 String areaId = param.getArea();
249 239 if (StringUtils.isNotEmpty(areaId)) {
250 240 if ("1".equals(searchType)) {
251   - query.addCriteria(Criteria.where("husbandAccountArea").is(areaId)
252   - .orOperator(Criteria.where("husbandCurrentArea").is(areaId)));
  241 + query.addCriteria(Criteria.where("husbandCurrentArea").is(areaId));
253 242 } else if ("2".equals(searchType)) {
254   - query.addCriteria(Criteria.where("wifeAccountArea").is(areaId)
255   - .orOperator(Criteria.where("wifeCurrentArea").is(areaId)));
256   - } else {
257   - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountArea").is(areaId)
258   - ,(Criteria.where("husbandCurrentArea").is(areaId))
259   - ,(Criteria.where("wifeAccountArea").is(areaId))
260   - ,(Criteria.where("wifeCurrentArea").is(areaId))));
  243 + query.addCriteria(Criteria.where("wifeCurrentArea").is(areaId));
261 244 }
262 245 String streetId = param.getStreet();
263 246 if (StringUtils.isNotEmpty(streetId)) {
264 247 if ("1".equals(searchType)) {
265   - query.addCriteria(Criteria.where("husbandAccountStreet").is(streetId)
266   - .orOperator(Criteria.where("husbandCurrentStreet").is(streetId)));
  248 + query.addCriteria(Criteria.where("husbandCurrentStreet").is(streetId));
267 249 } else if ("2".equals(searchType)) {
268   - query.addCriteria(Criteria.where("wifeAccountStreet").is(streetId)
269   - .orOperator(Criteria.where("wifeCurrentStreet").is(streetId)));;
270   - } else {
271   - query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountStreet").is(streetId)
272   - ,(Criteria.where("husbandCurrentStreet").is(streetId))
273   - ,(Criteria.where("wifeAccountStreet").is(streetId))
274   - ,(Criteria.where("wifeCurrentStreet").is(streetId))));
  250 + query.addCriteria(Criteria.where("wifeCurrentStreet").is(streetId));
275 251 }
276 252 }
277 253 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PregnantDeathServerImpl.java View file @ 89a3a8f
... ... @@ -4,6 +4,7 @@
4 4 import java.util.LinkedList;
5 5 import java.util.List;
6 6  
  7 +import com.lyms.platform.operate.web.facade.AutoMatchFacade;
7 8 import org.springframework.beans.BeanUtils;
8 9 import org.springframework.beans.factory.annotation.Autowired;
9 10 import org.springframework.data.domain.Sort;
... ... @@ -51,6 +52,11 @@
51 52 @Autowired
52 53 private UsersService usersService;
53 54  
  55 +
  56 + @Autowired
  57 + private AutoMatchFacade autoMatchFacade;
  58 +
  59 +
54 60 /**
55 61 * 保存单个
56 62 *
57 63  
... ... @@ -58,8 +64,9 @@
58 64 * @return
59 65 */
60 66 @Override
61   - public BaseResponse add(PregnantDeathRequest param) {
  67 + public BaseResponse add(PregnantDeathRequest param,Integer userId) {
62 68 param.setCreated(new Date());
  69 + param.setHospitalId(autoMatchFacade.getHospitalId(userId));
63 70 mongoTemplate.insert(param);
64 71 return new BaseResponse();
65 72 }
... ... @@ -86,7 +93,10 @@
86 93 * @return
87 94 */
88 95 @Override
89   - public BaseListResponse listPage(PregnantDeathListRequest param) {
  96 + public BaseListResponse listPage(PregnantDeathListRequest param,Integer userId) {
  97 +
  98 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  99 +
90 100 Query query = new Query();
91 101 // 编号
92 102 String number = param.getNumber();
... ... @@ -119,10 +129,8 @@
119 129 query.addCriteria(Criteria.where("createUser").is(createUser));
120 130 }
121 131 // 填写单位
122   - String hospitalId = param.getHospitalId();
123   - if (StringUtils.isNotEmpty(hospitalId)) {
124   - query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
125   - }
  132 +
  133 + query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
126 134 // 填写时间
127 135 String startCreated = param.getStartCreated();
128 136 String endCreated = param.getEndCreated();