jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9e16af99ab2d28841fd7ae74756e0208d0b67e8d

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

血压 体重列表查询权限设置

Showing 10 changed files with 167 additions and 49 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/IpUtils.java View file @ 9e16af9
... ... @@ -26,6 +26,24 @@
26 26 public static boolean isWhite(HttpServletRequest request) {
27 27 return ipSet.contains(request.getRemoteHost());
28 28 }
29   -
  29 + public static String getIpAddress(HttpServletRequest request) {
  30 + String ip = request.getHeader("x-forwarded-for");
  31 + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
  32 + ip = request.getHeader("Proxy-Client-IP");
  33 + }
  34 + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
  35 + ip = request.getHeader("WL-Proxy-Client-IP");
  36 + }
  37 + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
  38 + ip = request.getHeader("HTTP_CLIENT_IP");
  39 + }
  40 + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
  41 + ip = request.getHeader("HTTP_X_FORWARDED_FOR");
  42 + }
  43 + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
  44 + ip = request.getRemoteAddr();
  45 + }
  46 + return ip;
  47 + }
30 48 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyZjkService.java View file @ 9e16af9
... ... @@ -57,25 +57,57 @@
57 57 private AntExRecordService recordService;
58 58 @Autowired
59 59 private BasicConfigService basicConfigService;
  60 + private static final List<String> HOSPITALIDS= new ArrayList<>();
  61 + static {
  62 + HOSPITALIDS.add("2100001605");
  63 + HOSPITALIDS.add("2100001653");
  64 + HOSPITALIDS.add("2100001654");
  65 + HOSPITALIDS.add("2100001655");
  66 + HOSPITALIDS.add("2100001656");
  67 + HOSPITALIDS.add("2100001657");
  68 + HOSPITALIDS.add("2100001658");
  69 + HOSPITALIDS.add("2100001659");
  70 + HOSPITALIDS.add("2100001660");
  71 + HOSPITALIDS.add("2100001661");
  72 + HOSPITALIDS.add("2100001662");
  73 + HOSPITALIDS.add("2100001663");
  74 + HOSPITALIDS.add("2100001664");
  75 + HOSPITALIDS.add("2100001665");
  76 + HOSPITALIDS.add("2100001666");
  77 + HOSPITALIDS.add("2100001667");
  78 + HOSPITALIDS.add("2100001669");
  79 + HOSPITALIDS.add("2100001670");
  80 + HOSPITALIDS.add("2100001671");
  81 + HOSPITALIDS.add("2100001672");
  82 + HOSPITALIDS.add("2100001673");
  83 + HOSPITALIDS.add("2100001674");
  84 + HOSPITALIDS.add("2100001675");
  85 + HOSPITALIDS.add("2100001676");
  86 + HOSPITALIDS.add("2100001677");
60 87  
  88 + }
  89 +
61 90 public void syncLhxfyData()
62 91 {
63   - String hospitalId = "2100001605";
64   - String dateStr = DateUtil.getyyyy_MM_dd(new Date());
65   - Date start = DateUtil.getDayFirstSecond(DateUtil.parseYMD(dateStr));
66   - Date end = DateUtil.getDayLastSecond(DateUtil.parseYMD(dateStr));
67   - syncMcChildhealthChildren(hospitalId, start, end);
68   - syncChildhealthNeonate(hospitalId, start, end);
69   - syncMcWomanhealth42days(hospitalId, start, end);
70   - syncMcWomanhealthPostpartum(hospitalId, start, end);
71   - syncMcWomanhealthAntenatal(hospitalId, start, end);
72   - syncEtycf(hospitalId);
  92 + syncEtycf();
  93 + for (String hospitalId : HOSPITALIDS)
  94 + {
  95 + String dateStr = DateUtil.getyyyy_MM_dd(new Date());
  96 + Date start = DateUtil.getDayFirstSecond(DateUtil.parseYMD(dateStr));
  97 + Date end = DateUtil.getDayLastSecond(DateUtil.parseYMD(dateStr));
  98 + syncMcChildhealthChildren(hospitalId, start, end);
  99 + syncChildhealthNeonate(hospitalId, start, end);
  100 + syncMcWomanhealth42days(hospitalId, start, end);
  101 + syncMcWomanhealthPostpartum(hospitalId, start, end);
  102 + syncMcWomanhealthAntenatal(hospitalId, start, end);
  103 + }
  104 +
73 105 }
74 106  
75   - public void syncEtycf(String hospitalId)
  107 + public void syncEtycf()
76 108 {
77 109 EtycfJobModel jobModel = new EtycfJobModel();
78   - Long babyvisitnum = mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId).and("yn").ne("0")), NewbornVisit.class);
  110 + Long babyvisitnum = mongoTemplate.count(new Query(Criteria.where("hospitalId").in(HOSPITALIDS).and("yn").ne("0")), NewbornVisit.class);
79 111 jobModel.setBabyvisitnum(String.valueOf(babyvisitnum));
80 112  
81 113 BabyModelQuery babyQuery = new BabyModelQuery();
... ... @@ -85,7 +117,7 @@
85 117 babyQuery.setBuildTypeList(buildType);
86 118 babyQuery.setDataStatus(true);//排除自动建档数据
87 119 babyQuery.setYn(YnEnums.YES.getId());
88   - babyQuery.setHospitalId(hospitalId);
  120 + babyQuery.setHospitalIdList(HOSPITALIDS);
89 121  
90 122 Long etmanagenum = mongoTemplate.count(babyQuery.convertToQuery().convertToMongoQuery(), BabyModel.class);
91 123 jobModel.setEtmanagenum(String.valueOf(etmanagenum));
... ... @@ -94,7 +126,7 @@
94 126 patientsQuery.setYn(YnEnums.YES.getId());
95 127 patientsQuery.setExtEnable(false);
96 128 patientsQuery.setBuildTypeNot(1);
97   - patientsQuery.setHospitalId(hospitalId);
  129 + patientsQuery.setHospitalList(HOSPITALIDS);
98 130  
99 131  
100 132 Long ycfnum = mongoTemplate.count(patientsQuery.convertToQuery().convertToMongoQuery(), Patients.class);
101 133  
102 134  
103 135  
... ... @@ -106,17 +138,21 @@
106 138  
107 139  
108 140 UsersQuery usersQuery = new UsersQuery();
109   - usersQuery.setOrgId(Integer.parseInt(hospitalId));
110   - List<Users> userses = usersService.queryUsers(usersQuery);
111   - if (!CollectionUtils.isNotEmpty(userses))
112   - {
113   - return;
114   - }
115 141 List<String> uids = new ArrayList<>();
116   - for (Users users1 : userses)
  142 + for (String hospitalId : HOSPITALIDS)
117 143 {
118   - uids.add(users1.getId()+"");
  144 + usersQuery.setOrgId(Integer.parseInt(hospitalId));
  145 + List<Users> userses = usersService.queryUsers(usersQuery);
  146 + if (!CollectionUtils.isNotEmpty(userses))
  147 + {
  148 + continue;
  149 + }
  150 + for (Users users1 : userses)
  151 + {
  152 + uids.add(users1.getId()+"");
  153 + }
119 154 }
  155 +
120 156 Long postnum = mongoTemplate.count(new Query(Criteria.where("visitDoctor").in(uids)), MatdeliverFollowModel.class);
121 157 jobModel.setPostnum(String.valueOf(postnum));
122 158 jobModel.setHappentime(DateUtil.getyyyy_MM_dd(new Date()));
... ... @@ -287,7 +323,7 @@
287 323 try{
288 324 child.setReport_doctor_gb(usersService.getUsers(Integer.parseInt(checkModel.getCheckDoctor())).getName());
289 325 }catch (Exception e){}
290   - child.setInvalid(checkModel.getYn() == 1 ? "否" :"是" );
  326 + child.setInvalid(checkModel.getYn() == 1 ? "0" :"1" );
291 327 child.setVisit_date_gb(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
292 328 child.setNext_visit_date_gb(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
293 329 child.setUpdatetime(DateUtil.getyyyy_MM_dd(checkModel.getModified()));
... ... @@ -411,6 +447,7 @@
411 447 neonate.setMidwifery_institutions_gb(babyModel.getDeliverOrg());
412 448 }
413 449 neonate.setRegister_status("0");
  450 + neonate.setInvalid("0");
414 451  
415 452 mcChildhealthNeonates.add(neonate);
416 453 String json = JsonUtil.array2JsonString(mcChildhealthNeonates);
... ... @@ -485,7 +522,7 @@
485 522 days.setHappentime(DateUtil.getyyyy_MM_dd(post.getCheckTime()));
486 523 days.setCreatetime(DateUtil.getyyyy_MM_dd(post.getCreated()));
487 524 days.setRegister_status("0");
488   -
  525 + days.setInvalid("0");
489 526 mcWomanhealth42days.add(days);
490 527 String json = JsonUtil.array2JsonString(mcWomanhealth42days);
491 528 sendSyncData(json,URL+"lhfy/saveMcWomanhealth42days");
... ... @@ -700,7 +737,7 @@
700 737 antenatal.setCreatetime(DateUtil.getyyyy_MM_dd(examinationModel.getCreated()));
701 738 }
702 739 }
703   -
  740 + antenatal.setInvalid("0");
704 741 antenatal.setRegister_status("0");
705 742 mcWomanhealthAntenatals.add(antenatal);
706 743 String json = JsonUtil.array2JsonString(mcWomanhealthAntenatals);
... ... @@ -792,6 +829,7 @@
792 829 postpartum.setHappentime(DateUtil.getyyyy_MM_dd(followModel.getVisitDate()));
793 830 postpartum.setCreatetime(DateUtil.getyyyy_MM_dd(followModel.getCreateDate()));
794 831 postpartum.setRegister_status("0");
  832 + postpartum.setInvalid("0");
795 833 mcWomanhealthPostpartums.add(postpartum);
796 834 String json = JsonUtil.array2JsonString(mcWomanhealthPostpartums);
797 835 sendSyncData(json,URL+"lhfy/saveMcWomanhealthPostpartum");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java View file @ 9e16af9
... ... @@ -44,8 +44,9 @@
44 44 @ResponseBody
45 45 @RequestMapping(method = RequestMethod.GET)
46 46 @TokenRequired
47   - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
48   - return bloodPressureService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request));
  47 + public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age,
  48 + Integer page, Integer limit, HttpServletRequest request,String isAll) {
  49 + return bloodPressureService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request), isAll);
49 50 }
50 51  
51 52 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ 9e16af9
... ... @@ -58,9 +58,9 @@
58 58 @ResponseBody
59 59 @TokenRequired
60 60 @RequestMapping(value = "/query", method = RequestMethod.GET)
61   - public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart,
  61 + public BaseResponse list(String isAll,String key, String lastname,String vcCardNo, Integer currentWeekStart,
62 62 Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer type, Integer isUp, HttpServletRequest request) {
63   - return patientWeightService.list(key, lastname, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request),type,isUp);
  63 + return patientWeightService.list(isAll,key, lastname, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request),type,isUp);
64 64 }
65 65  
66 66 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 9e16af9
... ... @@ -195,6 +195,35 @@
195 195 @Autowired
196 196 private LhxfyZjkService lhxfyZjkService;
197 197  
  198 + private static final List<String> HOSPITALIDS= new ArrayList<>();
  199 + static {
  200 + HOSPITALIDS.add("2100001605");
  201 + HOSPITALIDS.add("2100001653");
  202 + HOSPITALIDS.add("2100001654");
  203 + HOSPITALIDS.add("2100001655");
  204 + HOSPITALIDS.add("2100001656");
  205 + HOSPITALIDS.add("2100001657");
  206 + HOSPITALIDS.add("2100001658");
  207 + HOSPITALIDS.add("2100001659");
  208 + HOSPITALIDS.add("2100001660");
  209 + HOSPITALIDS.add("2100001661");
  210 + HOSPITALIDS.add("2100001662");
  211 + HOSPITALIDS.add("2100001663");
  212 + HOSPITALIDS.add("2100001664");
  213 + HOSPITALIDS.add("2100001665");
  214 + HOSPITALIDS.add("2100001666");
  215 + HOSPITALIDS.add("2100001667");
  216 + HOSPITALIDS.add("2100001669");
  217 + HOSPITALIDS.add("2100001670");
  218 + HOSPITALIDS.add("2100001671");
  219 + HOSPITALIDS.add("2100001672");
  220 + HOSPITALIDS.add("2100001673");
  221 + HOSPITALIDS.add("2100001674");
  222 + HOSPITALIDS.add("2100001675");
  223 + HOSPITALIDS.add("2100001676");
  224 + HOSPITALIDS.add("2100001677");
  225 +
  226 + }
198 227 static Map<String, String> highRisks = new HashMap<>();
199 228  
200 229 static {
201 230  
... ... @@ -5021,10 +5050,9 @@
5021 5050  
5022 5051 @RequestMapping(value = "/syncEtycf", method = RequestMethod.GET)
5023 5052 @ResponseBody
5024   - public void syncEtycf(@RequestParam(required = false) String hospitalId
5025   - ) {
  5053 + public void syncEtycf() {
5026 5054  
5027   - lhxfyZjkService.syncEtycf(hospitalId);
  5055 + lhxfyZjkService.syncEtycf();
5028 5056 }
5029 5057  
5030 5058  
5031 5059  
5032 5060  
5033 5061  
... ... @@ -5084,22 +5112,26 @@
5084 5112  
5085 5113 @RequestMapping(value = "/syncLhfyzjkAll", method = RequestMethod.GET)
5086 5114 @ResponseBody
5087   - public void syncLhfyzjkAll(@RequestParam(required = false) String hospitalId,
  5115 + public void syncLhfyzjkAll(
5088 5116 @RequestParam(required = false) String startStr) {
5089   - lhxfyZjkService.syncEtycf(hospitalId);
  5117 + lhxfyZjkService.syncEtycf();
5090 5118 Date start = DateUtil.parseYMDHMS(startStr);
5091 5119 for (int i = 1 ; i <= 7 ; i++)
5092 5120 {
5093 5121 Date end = DateUtil.addYear(start,1);
5094   - lhxfyZjkService.syncMcChildhealthChildren(hospitalId, start, end);
5095   - lhxfyZjkService.syncChildhealthNeonate(hospitalId, start, end);
5096   - lhxfyZjkService.syncMcWomanhealth42days(hospitalId, start, end);
5097   - lhxfyZjkService.syncMcWomanhealthPostpartum(hospitalId, start, end);
5098   - lhxfyZjkService.syncMcWomanhealthAntenatal(hospitalId, start, end);
  5122 + for (String hospitalId : HOSPITALIDS)
  5123 + {
  5124 + lhxfyZjkService.syncMcChildhealthChildren(hospitalId,start, end);
  5125 + lhxfyZjkService.syncChildhealthNeonate(hospitalId,start, end);
  5126 + lhxfyZjkService.syncMcWomanhealth42days(hospitalId, start, end);
  5127 + lhxfyZjkService.syncMcWomanhealthPostpartum(hospitalId, start, end);
  5128 + lhxfyZjkService.syncMcWomanhealthAntenatal( hospitalId,start, end);
  5129 + }
5099 5130 start = end;
5100 5131 }
5101 5132  
5102 5133  
5103 5134 }
  5135 +
5104 5136 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 9e16af9
... ... @@ -445,7 +445,8 @@
445 445 public void usersLogin(@RequestParam(value = "account") String account,
446 446 @RequestParam(value = "vercode", required = false) String code,
447 447 @RequestParam(value = "password", required = false) String password,
448   - HttpServletResponse response) {
  448 + HttpServletResponse response,
  449 + HttpServletRequest request) {
449 450 Map<String, Object> resultMsgMap = new HashMap<>();
450 451 if (StringUtils.isEmpty(account) && (StringUtils.isEmpty(code) || StringUtils.isEmpty(password))) {
451 452 resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);//参数错误
... ... @@ -479,6 +480,13 @@
479 480 // List<String> orgs = Arrays.asList("2100002261","2100002324","196");
480 481 // if (!orgs.contains(u.getOrgId().toString())) {
481 482 // ResultUtils.buildParameterErrorResultAndWrite(response, "系统暂停使用");
  483 +// return;
  484 +// }
  485 +
  486 + String ip = IpUtils.getIpAddress(request);
  487 + System.out.println("userIp="+ip);
  488 +// if ("2100001452".equals(u.getOrgId().toString()) && "192.168.100.101".equals(ip)) {
  489 +// ResultUtils.buildParameterErrorResultAndWrite(response, "");
482 490 // return;
483 491 // }
484 492  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java View file @ 9e16af9
... ... @@ -11,7 +11,8 @@
11 11  
12 12 BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure);
13 13  
14   - BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
  14 + BaseResponse list(String key, String vcCardNo, Integer weekStart,
  15 + Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId,String type);
15 16  
16 17 BaseResponse info(String id, Date startDate);
17 18  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java View file @ 9e16af9
... ... @@ -28,7 +28,7 @@
28 28  
29 29 BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight);
30 30  
31   - BaseResponse list(String key,String lastname, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId,Integer type, Integer isUp);
  31 + BaseResponse list(String isAll,String key,String lastname, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId,Integer type, Integer isUp);
32 32  
33 33 BaseResponse info(String id);
34 34  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 9e16af9
... ... @@ -212,12 +212,22 @@
212 212 }
213 213  
214 214 @Override
215   - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
  215 + public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer
  216 + weekEnd, Integer age, Integer page, Integer limit, Integer userId,String isAll) {
216 217 boolean flag = false;
217   -// List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
218   -
219 218 List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
220   - Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds);
  219 + List<String> hids = new ArrayList<>();
  220 + if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll))
  221 + {
  222 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  223 + hids.add(hospitalId);
  224 + }
  225 + else
  226 + {
  227 + hids.addAll(hospitalIds);
  228 + }
  229 +
  230 + Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").in(hids);
221 231 Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds);
222 232 if (StringUtils.isNotEmpty(key)) {
223 233 flag = true;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 9e16af9
... ... @@ -493,11 +493,21 @@
493 493  
494 494  
495 495 @Override
496   - public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd,
  496 + public BaseResponse list(String isAll,String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd,
497 497 Integer age, Integer page, Integer limit, Integer userId,Integer type, Integer isUp) {
498 498 boolean flag = false;
499 499 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
500   - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  500 + List<String> hids = new ArrayList<>();
  501 + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(isAll) || "1".equals(isAll))
  502 + {
  503 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  504 + hids.add(hospitalId);
  505 + }
  506 + else
  507 + {
  508 + hids.addAll(hospital);
  509 + }
  510 + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hids);
501 511 Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital);
502 512 if (StringUtils.isNotBlank(key)) {
503 513 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key));