jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0bb4ee5c0313c21425429c7527ed53980f2cf306

Authored by zhangchao
2 parents 4a26af6f2b 71777e235f
Exists in dev

Merge branch 'dev' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform into dev

Showing 5 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java View file @ 0bb4ee5
... ... @@ -411,7 +411,7 @@
411 411 @RequestMapping(method = RequestMethod.POST, value = "/reviewAdd")
412 412 @ResponseBody
413 413 public BaseResponse reviewAdd(@RequestBody ReviewModel reviewModel, HttpServletRequest request) {
414   - return courseFacade.reviewAdd(reviewModel,getUserId(request));
  414 + return courseFacade.reviewAdd(reviewModel);
415 415 }
416 416  
417 417 /*
... ... @@ -420,7 +420,7 @@
420 420 @RequestMapping(method = RequestMethod.POST, value = "/reviewAddContent")
421 421 @ResponseBody
422 422 public BaseResponse reviewAddContent(@RequestBody ReviewModel reviewModel, HttpServletRequest request) {
423   - return courseFacade.reviewAddContent(reviewModel,getUserId(request));
  423 + return courseFacade.reviewAddContent(reviewModel);
424 424 }
425 425  
426 426 /*
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 0bb4ee5
... ... @@ -220,11 +220,11 @@
220 220 if("2100002419".equals(hospitalId)){//大同
221 221 Users u = usersService.getUsers(userId);
222 222 //产科网络 及 医务科 看全科室的
223   - if("2100004954".equals(u.getDeptId()) || "2100004955".equals(u.getDeptId())){
  223 + if(2100004954 == u.getDeptId() || 2100004955 == u.getDeptId()){
224 224 if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){
225 225 antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor());
226 226 }
227   - }else if("4".equals(u.getZhiChenId())){//主任看本科室
  227 + }else if(4 == u.getZhiChenId()){//主任看本科室
228 228 List<String> cIdList = new ArrayList<>();
229 229 UsersQuery usersQuery = new UsersQuery();
230 230 usersQuery.setDeptId(u.getDeptId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ 0bb4ee5
... ... @@ -1307,24 +1307,21 @@
1307 1307 return objectResponse;
1308 1308 }
1309 1309  
1310   - public BaseResponse reviewAdd(ReviewModel reviewModel, Integer userId) {
  1310 + public BaseResponse reviewAdd(ReviewModel reviewModel) {
1311 1311 BaseResponse objectResponse = new BaseResponse();
1312 1312 Date day=new Date();
1313 1313 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
1314 1314 String format = df.format(day);
1315 1315 reviewModel.setCreateDate(format);
1316 1316 reviewModel.setYn(YnEnums.YES.getId());
1317   - //操作人为当前用户id
1318   - reviewModel.setReviewId(userId.toString());
1319 1317  
1320   -
1321 1318 courseEvalService.reviewAdd(reviewModel);
1322 1319 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1323 1320 objectResponse.setErrormsg("成功");
1324 1321 return objectResponse;
1325 1322 }
1326 1323  
1327   - public BaseResponse reviewAddContent(ReviewModel reviewModel, Integer userId) {
  1324 + public BaseResponse reviewAddContent(ReviewModel reviewModel) {
1328 1325 BaseResponse objectResponse = new BaseResponse();
1329 1326 Date day=new Date();
1330 1327 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
... ... @@ -1332,7 +1329,6 @@
1332 1329 reviewModel.setCreateDate(format);
1333 1330 reviewModel.setYn(YnEnums.YES.getId());
1334 1331 //操作人为当前用户id
1335   - reviewModel.setReviewId(userId.toString());
1336 1332 reviewModel.setParentId(reviewModel.getParentId());
1337 1333  
1338 1334  
... ... @@ -1357,13 +1353,15 @@
1357 1353  
1358 1354 List<ReviewModel> matchingModels = new ArrayList<>(); // 创建用于存放匹配数据的新集合
1359 1355  
1360   - if (!models.isEmpty()) {
1361   - matchingModels.add(models.get(0)); // 将models集合中的第一条数据添加到匹配集合中
1362   - }
1363   -
1364   - if (!models1.isEmpty()) {
1365   - int index = models1.size() > 1 ? 1 : 0; // 如果models1集合中有多个数据，则获取第二条数据，否则获取第一条数据
1366   - matchingModels.add(models1.get(index)); // 将models1集合中的数据添加到匹配集合中
  1356 + for (ReviewModel model : models) {
  1357 + String ids = model.getId(); // 获取models中的ID
  1358 + for (ReviewModel model1 : models1) {
  1359 + if (model1.getParentId() == ids) { // 在models1中查找匹配的parentId
  1360 + matchingModels.add(model); // 将对应的models数据添加到匹配集合中
  1361 + matchingModels.add(model1); // 将对应的models1数据添加到匹配集合中
  1362 + break; // 找到匹配数据后跳出内层循环
  1363 + }
  1364 + }
1367 1365 }
1368 1366  
1369 1367  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 0bb4ee5
... ... @@ -2706,11 +2706,11 @@
2706 2706 if("2100002419".equals(hid)){//大同
2707 2707 Users u = usersService.getUsers(childbirthManagerRequest.getOperatorId());
2708 2708 //产科网络 及 医务科 看全科室的
2709   - if("2100004954".equals(u.getDeptId()) || "2100004955".equals(u.getDeptId())){
  2709 + if(2100004954 == u.getDeptId() || 2100004955 == u.getDeptId()){
2710 2710 if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {
2711 2711 patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
2712 2712 }
2713   - }else if("4".equals(u.getZhiChenId())){//主任看本科室
  2713 + }else if(4 == u.getZhiChenId()){//主任看本科室
2714 2714 List<String> deliverDoctorList = new ArrayList<>();
2715 2715 UsersQuery usersQuery = new UsersQuery();
2716 2716 usersQuery.setDeptId(u.getDeptId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 0bb4ee5
... ... @@ -3197,9 +3197,9 @@
3197 3197 if("2100002419".equals(hospitalId)){
3198 3198 Users u = usersService.getUsers(patientManagerRequest.getOperatorId());
3199 3199 //产科网络 及 医务科 看全科室的
3200   - if("2100004954".equals(u.getDeptId()) || "2100004955".equals(u.getDeptId())){
  3200 + if(2100004954 == u.getDeptId() || 2100004955 == u.getDeptId()){
3201 3201 patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor());
3202   - }else if("4".equals(u.getZhiChenId())){//主任看本科室
  3202 + }else if(4 == u.getZhiChenId()){//主任看本科室
3203 3203 List<String> bookbuildingDoctorList = new ArrayList<>();
3204 3204 UsersQuery usersQuery = new UsersQuery();
3205 3205 usersQuery.setDeptId(u.getDeptId());