jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ac7fdf5cf7fc37ff2bdb622610796a5cd431235b

Authored by jiangjiazhi
2 parents 31347bee6a 001179ca8d
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java View file @ ac7fdf5
... ... @@ -15,7 +15,7 @@
15 15  
16 16 YUN_WEEK(1,"周",10,42),
17 17 BABY_DAY(2,"天",11,30),
18   - BABY_MONTH(3,"月",12,36),
  18 + BABY_MONTH(3,"月龄",12,36),
19 19 CHAN_DAY(4,"天",13,60);
20 20  
21 21 DatePointEnums(int id, String name, int pid,int count) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ ac7fdf5
... ... @@ -106,7 +106,7 @@
106 106 param.setVcCardNo(vcCardNo);
107 107 param.setHospitalId(hospitalId);
108 108 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
109   - return babyBookbuildingFacade.queryBabyBuildRecord(param,856);
  109 + return babyBookbuildingFacade.queryBabyBuildRecord(param,loginState.getId());
110 110 }
111 111  
112 112  
... ... @@ -201,9 +201,10 @@
201 201 */
202 202 @RequestMapping(method = RequestMethod.POST, value = "/sendBabyGuildSms")
203 203 @ResponseBody
204   - public BaseResponse babyGuildSms(@Valid @RequestBody BabyGuideSmsequest request) {
205   -
206   - return babyBookbuildingFacade.sendBabyGuideSms(request);
  204 + @TokenRequired
  205 + public BaseResponse babyGuildSms(@Valid @RequestBody BabyGuideSmsequest param,HttpServletRequest request) {
  206 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  207 + return babyBookbuildingFacade.sendBabyGuideSms(param,loginState.getId());
207 208 }
208 209  
209 210  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ ac7fdf5
... ... @@ -1286,13 +1286,25 @@
1286 1286 }
1287 1287  
1288 1288 babyQuery.setDiagnose(request.getDiagnose());
1289   - // babyQuery.setNextDateStart(DateUtil.parseYMD(request.getNextDateStart()));
1290   -// babyQuery.setNextDateEnd(DateUtil.parseYMD(request.getNextDateEnd()));
  1289 + //预约时间
  1290 + if (StringUtils.isNotEmpty(request.getNextDate()))
  1291 + {
  1292 + String nextDateStr = request.getNextDate();
  1293 + String[] dates = nextDateStr.split(" - ");
1291 1294  
  1295 + babyQuery.setNextDateStart(DateUtil.parseYMD(dates[0]));
  1296 + babyQuery.setNextDateEnd(DateUtil.parseYMD(dates[1]));
  1297 + }
1292 1298  
1293   -// babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart()));
1294   -// babyQuery.setBirthEnd(DateUtil.parseYMD(request.getBirthEnd()));
  1299 + if (StringUtils.isNotEmpty(request.getBirth()))
  1300 + {
  1301 + String birthStr = request.getBirth();
  1302 + String[] dates = birthStr.split(" - ");
  1303 + babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
  1304 + babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
  1305 + }
1295 1306  
  1307 +
1296 1308 if (request.getServiceType() != null && request.getServiceType() != 100) {
1297 1309 babyQuery.setServiceType(request.getServiceType());
1298 1310 }
... ... @@ -1321,7 +1333,68 @@
1321 1333 * @param request
1322 1334 * @return
1323 1335 */
1324   - public BaseResponse sendBabyGuideSms(BabyGuideSmsequest request) {
  1336 + public BaseResponse sendBabyGuideSms(BabyGuideSmsequest request,Integer userId) {
  1337 + String hospitalId = "";
  1338 +
  1339 +
  1340 + //得到当前登录的医院id
  1341 + if (userId != null)
  1342 + {
  1343 + Users dbuser = usersService.getUsers(userId);
  1344 + if (dbuser != null) {
  1345 + hospitalId = String.valueOf(dbuser.getOrgId());
  1346 + }
  1347 + }
  1348 +
  1349 + OrganizationQuery orgQuery = new OrganizationQuery();
  1350 + orgQuery.setYn(YnEnums.YES.getId());
  1351 + orgQuery.setId(Integer.parseInt(hospitalId));
  1352 + List<Organization> list = organizationService.queryOrganization(orgQuery);
  1353 + boolean isRunning = false;
  1354 + if (CollectionUtils.isNotEmpty(list))
  1355 + {
  1356 + Organization org = list.get(0);
  1357 + if (org != null)
  1358 + {
  1359 + Integer status = org.getStatus();
  1360 + if (status != null && (status == HospitalStatusEnums.SYX.getId() || status == HospitalStatusEnums.ZSYX.getId()))
  1361 + {
  1362 + isRunning = true;
  1363 + }
  1364 + }
  1365 + }
  1366 + if (!isRunning)
  1367 + {
  1368 + BaseResponse objectResponse = new BaseResponse();
  1369 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  1370 + objectResponse.setErrormsg("暂无发送权限");
  1371 + return objectResponse;
  1372 + }
  1373 +
  1374 + SmsConfigQuery configQuery = new SmsConfigQuery();
  1375 + configQuery.setYn(YnEnums.YES.getId());
  1376 + configQuery.setHospitalId(hospitalId);
  1377 + //查询出对应医院配置
  1378 + List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery);
  1379 + boolean isStart = false;
  1380 + if (CollectionUtils.isNotEmpty(configs))
  1381 + {
  1382 + String serviceStr = configs.get(0).getSmsService();
  1383 + if (StringUtils.isNotEmpty(serviceStr))
  1384 + {
  1385 + isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr);
  1386 + }
  1387 +
  1388 + }
  1389 + if (!isStart)
  1390 + {
  1391 + BaseResponse objectResponse = new BaseResponse();
  1392 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  1393 + objectResponse.setErrormsg("暂无发送权限");
  1394 + return objectResponse;
  1395 + }
  1396 +
  1397 +
1325 1398 MessageListRequest smsList = new MessageListRequest();
1326 1399 List<MessageRequest> messages = new ArrayList<>();
1327 1400