fangcheng / regional-platform

Download as
Browse Code »

Commit 44af4a51bc9c45ae09e1ad7549efe6f4eb3048a7

Authored by jiangjiazhi
1 parent d4302263b0
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 2 changed files with 29 additions and 17 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 44af4a5
... ... @@ -412,40 +412,40 @@
412 412 referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage());
413 413 referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
414 414 referralApplyOrderQuery.setNeed("1");
415   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getReviced())){
416   - String[] str= applyOrderQueryRequest.getReviced().split(" - ");
417   - if(str.length>1){
  415 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getReviced())) {
  416 + String[] str = applyOrderQueryRequest.getReviced().split(" - ");
  417 + if (str.length > 1) {
418 418 referralApplyOrderQuery.setRevicedStart(DateUtil.parseYMD(str[0]));
419 419 }
420   - if(str.length==2){
421   - referralApplyOrderQuery.setRevicedEnd(new Date(DateUtil.parseYMD(str[1]).getTime()+86398000));
  420 + if (str.length == 2) {
  421 + referralApplyOrderQuery.setRevicedEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000));
422 422 }
423 423 }
424 424  
425   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferred())){
426   - String[] str= applyOrderQueryRequest.getTransferred().split(" - ");
427   - if(str.length>1){
  425 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferred())) {
  426 + String[] str = applyOrderQueryRequest.getTransferred().split(" - ");
  427 + if (str.length > 1) {
428 428 referralApplyOrderQuery.setTransferredStart(DateUtil.parseYMD(str[0]));
429 429 }
430   - if(str.length==2){
  430 + if (str.length == 2) {
431 431 referralApplyOrderQuery.setTransferredEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000));
432 432 }
433 433 }
434 434  
435   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getBirth())){
436   - String[] str= applyOrderQueryRequest.getBirth().split(" - ");
437   - if(str.length>1){
  435 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getBirth())) {
  436 + String[] str = applyOrderQueryRequest.getBirth().split(" - ");
  437 + if (str.length > 1) {
438 438 referralApplyOrderQuery.setBirthStart(DateUtil.parseYMD(str[0]));
439 439 }
440   - if(str.length==2){
  440 + if (str.length == 2) {
441 441 referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000));
442 442 }
443 443 }
444 444  
445   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())){
  445 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) {
446 446 referralApplyOrderQuery.setBirthEnd(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlStart())));
447 447 }
448   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) {
  448 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) {
449 449 referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())));
450 450 }
451 451  
... ... @@ -461,7 +461,7 @@
461 461  
462 462 // List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid());
463 463  
464   - List<String> diagnoseList = applyOrderModel.getrRisk();
  464 + List<String> diagnoseList = applyOrderModel.getrRisk();
465 465 if (NumberUtils.isNumber(zhuanchu)) {
466 466 Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
467 467 if (null != zhuanc) {
... ... @@ -640,6 +640,13 @@
640 640 applyOrderResult.setrRisk(stringBuilder.toString());
641 641 applyOrderResult.setScore(orderModel.getScore());
642 642 applyOrderResult.setrLevel(highScoreResult.getLevelStr());
  643 + Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
  644 + if (null != patients) {
  645 + if (1 == patients.getDueStatus())
  646 + applyOrderResult.setcDueWeek("终止妊娠");
  647 + else if (patients.getType() == 3)
  648 + applyOrderResult.setcDueWeek("已分娩");
  649 + }
643 650 data.add(applyOrderResult);
644 651 }
645 652 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 44af4a5
... ... @@ -220,7 +220,12 @@
220 220 sieveListResult.convertToResult(sieveModel);
221 221 Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
222 222 if(null!=patients){
223   - sieveListResult.setIsGravida(patients.getFmDate()!=null?"0":"1");
  223 + sieveListResult.setIsGravida(patients.getFmDate() != null ? "0" : "1");
  224 + if(1==patients.getDueStatus())
  225 + sieveListResult.setcDueWeek("终止妊娠");
  226 + else if(patients.getType()==3){
  227 + sieveListResult.setcDueWeek("已分娩");
  228 + }
224 229 }
225 230 data.add(sieveListResult);
226 231 }