shiyang / regional-platform

Download as
Browse Code »

Commit b3c538d70c77b6c48b3a9d3bc8973788cee1812d

Authored by baohanddd
2 parents be67e60514 bf57890a20
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java View file @ b3c538d
... ... @@ -23,9 +23,10 @@
23 23 @RequestMapping(value = "/template")
24 24 public void productSms(HttpServletResponse response){
25 25 smsService.productTemplateSms();
26   - smsService.productChanAmsSms();
27   - smsService.productYunAmsSms();
28   - smsService.productChildAmsSms();
  26 +
  27 +// smsService.productChanAmsSms();
  28 +// smsService.productYunAmsSms();
  29 +// smsService.productChildAmsSms();
29 30  
30 31 // MessageListRequest list = new MessageListRequest();
31 32 // List<MessageRequest> messages = new ArrayList<>();
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ b3c538d
... ... @@ -623,7 +623,7 @@
623 623 SmsConfigQuery configQuery = new SmsConfigQuery();
624 624 configQuery.setYn(YnEnums.YES.getId());
625 625 configQuery.setPrefixTypes(new Integer[]{0, 1});
626   - configQuery.setHospitalId(221+"");
  626 +// configQuery.setHospitalId(221+"");
627 627  
628 628 //查询出对应医院配置
629 629 List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery);
platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java View file @ b3c538d
... ... @@ -182,7 +182,7 @@
182 182  
183 183  
184 184 public static void main(String[] args) {
185   - getMessageTemplateMap("44288137-ccde-4a11-9eeb-839450320e12",
  185 + getMessageTemplateMap("221",
186 186 AmsServiceTypeEnum.CHILD_GUIDE);
187 187 }
188 188  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ b3c538d
... ... @@ -389,18 +389,7 @@
389 389 quanPatientsResult.setlName(patients.getBookbuildingDoctor());
390 390 }
391 391 }
392   - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
393   - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
394   - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
395   - if (null != users) {
396   - quanPatientsResult.setCheckDoctor(users.getName());
397   - } else {
398   - quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
399   - }
400   - } else {
401   - quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
402   - }
403   - }
  392 +
404 393 antExQuery.setHospitalId(null);
405 394 //复诊次数
406 395 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
407 396  
... ... @@ -426,10 +415,36 @@
426 415 List<AntenatalExaminationModel> examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
427 416 if (CollectionUtils.isNotEmpty(examinationModels)) {
428 417 nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime());
  418 +
  419 + if (StringUtils.isNotEmpty(examinationModels.get(0).getCheckDoctor())) {
  420 + if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())) {
  421 + Users users = usersService.getUsers(NumberUtils.toInt(examinationModels.get(0).getCheckDoctor()));
  422 + if (null != users) {
  423 + quanPatientsResult.setCheckDoctor(users.getName());
  424 + } else {
  425 + quanPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor());
  426 + }
  427 + } else {
  428 + quanPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor());
  429 + }
  430 + }
  431 +
429 432 } else {
430 433 List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
431 434 if (CollectionUtils.isNotEmpty(list)) {
432 435 nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime());
  436 + if (StringUtils.isNotEmpty(list.get(0).getProdDoctor())) {
  437 + if (NumberUtils.isNumber(list.get(0).getProdDoctor())) {
  438 + Users users = usersService.getUsers(NumberUtils.toInt(list.get(0).getProdDoctor()));
  439 + if (null != users) {
  440 + quanPatientsResult.setCheckDoctor(users.getName());
  441 + } else {
  442 + quanPatientsResult.setCheckDoctor(list.get(0).getProdDoctor());
  443 + }
  444 + } else {
  445 + quanPatientsResult.setCheckDoctor(list.get(0).getProdDoctor());
  446 + }
  447 + }
433 448 }
434 449 }
435 450 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
... ... @@ -466,18 +481,8 @@
466 481 riskPatientsResult.setlName(patients.getBookbuildingDoctor());
467 482 }
468 483 }
469   - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
470   - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
471   - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
472   - if (null != users) {
473   - riskPatientsResult.setCheckDoctor(users.getName());
474   - } else {
475   - riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
476   - }
477   - } else {
478   - riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
479   - }
480   - }
  484 +
  485 +
481 486 antExQuery.setPid(patients.getPid());
482 487 antExQuery.setYn(YnEnums.YES.getId());
483 488 antExQuery.setHospitalId(null);
484 489  
485 490  
486 491  
... ... @@ -498,15 +503,33 @@
498 503 riskPatientsResult.setcTimes(i + b);
499 504 riskPatientsResult.setcHTimes(chi+chb);
500 505 String nextCheckTime = "";
  506 +
501 507 List<AntenatalExaminationModel> examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
502 508 if (CollectionUtils.isNotEmpty(examinationModels)) {
  509 + if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())){
  510 + Users users = usersService.getUsers(NumberUtils.toInt(examinationModels.get(0).getCheckDoctor()));
  511 + if (null != users) {
  512 + riskPatientsResult.setCheckDoctor(users.getName());
  513 + } else {
  514 + riskPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor());
  515 + }
  516 + }
503 517 nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime());
504 518 } else {
505 519 List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
506 520 if (CollectionUtils.isNotEmpty(list)) {
507 521 nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime());
  522 + if (NumberUtils.isNumber(list.get(0).getProdDoctor())){
  523 + Users users = usersService.getUsers(NumberUtils.toInt(list.get(0).getProdDoctor()));
  524 + if (null != users) {
  525 + riskPatientsResult.setCheckDoctor(users.getName());
  526 + } else {
  527 + riskPatientsResult.setCheckDoctor(list.get(0).getProdDoctor());
  528 + }
  529 + }
508 530 }
509 531 }
  532 +
510 533 riskPatientsResult.setcTime(nextCheckTime);
511 534 riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr());
512 535 riskPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel()));