jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 51d743a4b5162e41192198b735b6dc4b4a29c8d3

Authored by jiangjiazhi
2 parents 8fe1e7f681 ba350e993b
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 4 changed files

platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 51d743a
... ... @@ -1099,6 +1099,8 @@
1099 1099 {
1100 1100 Date startDate = DateUtil.getNewDate(-end, "天", sendTimeType);
1101 1101 Date endDate = DateUtil.getNewDate(-start,"天",sendTimeType);
  1102 + startDate = DateUtil.formatDate(startDate);
  1103 + endDate = DateUtil.formatDate(endDate);
1102 1104 babyModelQuery.setBirthStart(startDate);
1103 1105 babyModelQuery.setBirthEnd(endDate);
1104 1106  
... ... @@ -1140,6 +1142,8 @@
1140 1142 {
1141 1143 Date startDate = DateUtil.getNewDate(-end-1, "月", sendTimeType);
1142 1144 Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType);
  1145 + startDate = DateUtil.formatDate(startDate);
  1146 + endDate = DateUtil.formatDate(endDate);
1143 1147 babyModelQuery.setBirthStart(startDate);
1144 1148 babyModelQuery.setBirthEnd(endDate);
1145 1149  
... ... @@ -1260,6 +1264,8 @@
1260 1264 {
1261 1265 Date startDate = DateUtil.getNewDate(-end,"天",sendTimeType);
1262 1266 Date endDate = DateUtil.getNewDate(-start,"天",sendTimeType);
  1267 + startDate = DateUtil.formatDate(startDate);
  1268 + endDate = DateUtil.formatDate(endDate);
1263 1269 babyModelQuery.setBirthStart(startDate);
1264 1270 babyModelQuery.setBirthEnd(endDate);
1265 1271 messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template));
... ... @@ -1274,6 +1280,8 @@
1274 1280 {
1275 1281 Date startDate = DateUtil.getNewDate(-end-1,"月",sendTimeType);
1276 1282 Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType);
  1283 + startDate = DateUtil.formatDate(startDate);
  1284 + endDate = DateUtil.formatDate(endDate);
1277 1285 babyModelQuery.setBirthStart(startDate);
1278 1286 babyModelQuery.setBirthEnd(endDate);
1279 1287 messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 51d743a
... ... @@ -245,7 +245,7 @@
245 245 if (CollectionUtils.isNotEmpty(list))
246 246 {
247 247 BabyModel babyModel = list.get(0);
248   - if (babyModel.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId())
  248 + if (babyModel.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() && babyModel.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId())
249 249 {
250 250 createBuildSms(babyModel);
251 251 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 51d743a
... ... @@ -473,13 +473,13 @@
473 473  
474 474  
475 475 PatientsQuery pQuery = new PatientsQuery();
476   - patientsQuery.setYn(YnEnums.YES.getId());
477   - patientsQuery.setId(id);
  476 + pQuery.setYn(YnEnums.YES.getId());
  477 + pQuery.setId(id);
478 478 List<Patients> list = yunBookbuildingService.queryPregnantWithQuery(pQuery);
479 479 if (CollectionUtils.isNotEmpty(list))
480 480 {
481 481 Patients pat = list.get(0);
482   - if (pat.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() || pat.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId())
  482 + if (pat.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() && pat.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId())
483 483 {
484 484 createBuildSms(pat);
485 485 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ 51d743a
... ... @@ -346,18 +346,24 @@
346 346 List<Map> list = new ArrayList<>();
347 347 if (id != null)
348 348 {
349   - Users dbuser = usersService.getUsers(id);
  349 + UsersQuery query = new UsersQuery();
  350 + query.setYn(YnEnums.YES.getId());
  351 + query.setEnable(1);
  352 + query.setId(id);
  353 + List<Users> dbusers = usersService.queryUsers(query);
350 354  
351   - if (dbuser != null)
  355 + if (CollectionUtils.isNotEmpty(dbusers))
352 356 {
  357 + Users dbuser = dbusers.get(0);
353 358 UsersQuery usersQuery = new UsersQuery();
354 359 usersQuery.setYn(YnEnums.YES.getId());
355 360 usersQuery.setOrgId(dbuser.getOrgId());
356   - if (dbuser != null && dbuser.getZhiChenId() == ZhiChenEnums.DOCTOR.getId() && dbuser.getDeptId() != null)
357   - {
358   - usersQuery.setDeptId(dbuser.getDeptId());
359   - }
360   - List<Users> users = usersService.queryUsers2(usersQuery);
  361 + usersQuery.setEnable(1);
  362 +// if (dbuser != null && dbuser.getZhiChenId() == ZhiChenEnums.DOCTOR.getId() && dbuser.getDeptId() != null)
  363 +// {
  364 +// usersQuery.setDeptId(dbuser.getDeptId());
  365 +// }
  366 + List<Users> users = usersService.queryUsers(usersQuery);
361 367  
362 368 if (CollectionUtils.isNotEmpty(users))
363 369 {