diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java index 108a3e3..07132a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java @@ -80,7 +80,7 @@ public class PatientDtController { public BaseResponse getPatients(@RequestHeader("Authorization")String authorization, String idCard, String name, String phone){ BaseResponse baseResponse=new BaseResponse(); - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return baseResponse.setErrormsg("权限异常").setErrorcode(-1); } @@ -182,7 +182,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/antexmanage") @ResponseBody public BaseResponse queryAntenatalExamination(@RequestHeader("Authorization")String authorization,String idCard,String name,String phone,String vcCardNo){ - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrormsg("权限异常").setErrorcode(-1); } String cardNo=idCard; @@ -220,7 +220,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/getLastRisk") @ResponseBody public BaseResponse getLastRisk(@RequestHeader("Authorization")String authorization,String patientId) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrormsg("权限异常").setErrorcode(-1); } return antenatalExaminationFacade.getLastRisk(patientId, null); @@ -235,7 +235,7 @@ public class PatientDtController { @RequestMapping(value = "/dt/checkReport", method = RequestMethod.GET) @ResponseBody public BaseResponse checkReport(@RequestHeader("Authorization")String authorization,@RequestParam(required = false) List antex, @RequestParam(required = false) String antexc) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrormsg("权限异常").setErrorcode(-1); } return viewFacade.checkReport(antex, antexc, userId); @@ -250,7 +250,7 @@ public class PatientDtController { @RequestMapping(value = "/dt/findAntenatalExaminationData", method = RequestMethod.GET) @ResponseBody public BaseObjectResponse findAntenatalExaminationData(@RequestHeader("Authorization")String authorization,@RequestParam("id") String id) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseObjectResponse().setErrormsg("权限异常").setErrorcode(-1); } return viewFacade.findAntenatalExamination(id); @@ -265,7 +265,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/queryInPerson") @ResponseBody public BaseResponse queryInPerson(@RequestHeader("Authorization")String authorization) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrormsg("权限异常").setErrorcode(-1); } return stopPregnancyFacade.queryInPerson(userId); @@ -279,7 +279,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/queryInPerson2") @ResponseBody public BaseResponse queryInPerson2(@RequestHeader("Authorization")String authorization) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrormsg("权限异常").setErrorcode(-1); } return stopPregnancyFacade.queryInPerson2(userId); @@ -303,7 +303,7 @@ public class PatientDtController { @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "name", required = false) String name) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ ResultUtils.buildParameterErrorResultAndWrite(response, "权限异常"); return ; } @@ -382,7 +382,7 @@ public class PatientDtController { @ResponseBody public BaseResponse getPatent2(@Valid PatientQueryRequest request, @RequestHeader("Authorization")String authorization) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } return patientFacade.findPatient2(request, userId); @@ -391,7 +391,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/getGongGaoCurve") @ResponseBody public BaseResponse getGongGaoLine(@RequestParam(required = true) String patientId,@RequestHeader("Authorization")String authorization) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } return antenatalExaminationFacade.getGongGaoLine(patientId, userId); @@ -400,7 +400,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/antex") @ResponseBody public BaseResponse findOneAntById(@RequestHeader("Authorization")String authorization,@Valid AntExQueryRequest antExQueryRequest) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } antExQueryRequest.setUserId(userId); @@ -410,7 +410,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.POST, value = "/dt/antexmanage") @ResponseBody public BaseResponse addOneAntenatalExamination(@RequestHeader("Authorization")String authorization,@Valid @RequestBody AntExAddRequest antExAddRequest) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } BaseResponse baseResponse = antenatalExaminationFacade.addOneAntEx(antExAddRequest, userId); @@ -428,7 +428,7 @@ public class PatientDtController { @ResponseBody public BaseObjectResponse findAntExChuData(@RequestParam("id") String id, @RequestHeader("Authorization")String authorization) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常"); } BaseObjectResponse br = viewFacade.findAntExChu(id); @@ -449,7 +449,7 @@ public class PatientDtController { @RequestParam(required = false) String userName, @RequestParam(defaultValue = "1") Integer perType//默认孕妇 ) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常"); } return lisFacade.getLisAndRisData(vcCardNo,sINCard, phone,cardNo, sortType,perType, userName,userId); @@ -463,7 +463,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.POST, value = "/dt/addAntexHighRisk") @ResponseBody public BaseResponse addAntexHighRisk(@RequestHeader("Authorization")String authorization,@RequestBody AntExHighRiskModel antExHighRiskModel){ - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } return antenatalExaminationFacade.addAntexHighRisk(antExHighRiskModel,userId); @@ -477,7 +477,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/queryAntexHighRisk") @ResponseBody public BaseResponse queryAntexHighRisk(@RequestHeader("Authorization")String authorization,@RequestParam String parentId){ - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } return antenatalExaminationFacade.queryAntexHighRisk(parentId,userId); @@ -486,7 +486,7 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.POST, value = "/dt/addPatientNipt") @ResponseBody public BaseResponse addPatientNipt(@RequestHeader("Authorization")String authorization,@RequestBody PatientNiptDTO patientNiptDTO){ - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } return antenatalExaminationFacade.addPatientNipt(patientNiptDTO,userId); @@ -511,7 +511,7 @@ public class PatientDtController { @RequestParam(required = false) String doctorName ) { - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常"); } BaseResponse baseResponse=new BaseResponse(); @@ -574,7 +574,7 @@ public class PatientDtController { public BaseResponse syncAppointmentList(@RequestHeader("Authorization")String authorization, @RequestParam(required = true) String doctor, @RequestParam(required = true) String date){ - if (!Authorization.equals(authorization)){ + if (!authorization.contains(Authorization)){ return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常"); } Map params=new HashMap<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index d7337cb..f6b8792 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1452,15 +1452,15 @@ public class BookbuildingFacade { mr.setSmsStatus(SmsStatusEnums.WFS.getId()); mr.setServiceType(1); //判断发送类型 - mr.setFirst("大同市第一人民医院"); + mr.setFirst("孕期称重内容"); mr.setObjType(1); - mr.setKeyword1("产科（请点击此处录入数据，获取营养指导）"); + mr.setKeyword1("大同市第一人民医院"); mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); //planTime 和 timeType为必填 否则推送中心会推送异常 mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - mr.setKeyword2("产科"); - mr.setRemark(patient.getUsername()); + mr.setKeyword2("产科（请在体重和营养管理获取营养指导报告）"); + // mr.setRemark(patient.getUsername()); mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId()); messages.add(mr); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index d6ddeb1..96ddf72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -638,6 +638,8 @@ public class StopPregnancyFacade { pmap.put("id", user.getId()); pmap.put("name", user.getName()); pmap.put("deptId", user.getDeptId()); + pmap.put("account",user.getAccount()); + pmap.put("x",user.getPwd()); list.add(pmap); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java index d4d6231..ffcd0c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java @@ -87,17 +87,32 @@ public class LocalCacheSessionStrategy implements ISessionProvider { LoginContext loginContext = new LoginContext(); if (CollectionUtils.isNotEmpty(membersList)) { Integer userId = membersList.get(0).getId(); - if(MD5Utils.md5(password).toUpperCase().equals(membersList.get(0).getPwd())){ - loginContext.setId(userId); - String token = preFix + TokenUtils.getToken(UUID.randomUUID().toString()); - loginContext.setToken(token); - loginContext.setErrorcode(0); - loginContext.setErrormsg("登录成功"); - cache.put(token, loginContext); - }else{ - loginContext.setErrormsg("密码错误."); - loginContext.setErrorcode(4003); + if (password.length()>20){ + if (password.equals(membersList.get(0).getPwd())){ + loginContext.setId(userId); + String token = preFix + TokenUtils.getToken(UUID.randomUUID().toString()); + loginContext.setToken(token); + loginContext.setErrorcode(0); + loginContext.setErrormsg("登录成功"); + cache.put(token, loginContext); + }else { + loginContext.setErrormsg("密码错误."); + loginContext.setErrorcode(4003); + } + }else { + if(MD5Utils.md5(password).toUpperCase().equals(membersList.get(0).getPwd())){ + loginContext.setId(userId); + String token = preFix + TokenUtils.getToken(UUID.randomUUID().toString()); + loginContext.setToken(token); + loginContext.setErrorcode(0); + loginContext.setErrormsg("登录成功"); + cache.put(token, loginContext); + }else{ + loginContext.setErrormsg("密码错误."); + loginContext.setErrorcode(4003); + } } + }else{ loginContext.setErrormsg("用户不存在."); loginContext.setErrorcode(4003);