jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5f95c21d83d576a7c66eb0daa8cb717b562d7b6e

Authored by gengxiaokai
1 parent a1dd5ab37d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

新生儿实验室

Showing 7 changed files with 263 additions and 138 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java View file @ 5f95c21
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.common.dao.operator.MongoQuery;
5 5 import com.lyms.platform.pojo.BabySieveModel;
6 6 import com.lyms.platform.query.BabySieveQuery;
  7 +import org.apache.commons.lang.StringUtils;
7 8 import org.springframework.beans.factory.annotation.Autowired;
8 9 import org.springframework.data.domain.Sort;
9 10 import org.springframework.stereotype.Service;
... ... @@ -22,6 +23,10 @@
22 23  
23 24 public List<BabySieveModel> getBabySieveQuery(BabySieveQuery babySieveQuery){
24 25 MongoQuery query = babySieveQuery.convertToQuery();
  26 + if (StringUtils.isNotEmpty(babySieveQuery.getNeed())) {
  27 + babySieveQuery.mysqlBuild(babySieveDao.queryBabySieveCount(query));
  28 + query.start(babySieveQuery.getOffset()).end(babySieveQuery.getLimit());
  29 + }
25 30 return babySieveDao.queryBabySieve(query.addOrder(Sort.Direction.DESC, "created"));
26 31 }
27 32  
platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java View file @ 5f95c21
... ... @@ -36,6 +36,9 @@
36 36 //采血日期
37 37 private Date collectDate;
38 38  
  39 + //筛查日期
  40 + private Date sieveDate;
  41 +
39 42 /****母亲信息*********/
40 43  
41 44 //母亲姓名
... ... @@ -91,6 +94,14 @@
91 94 //修改时间
92 95 private Date modified;
93 96  
  97 + public Date getSieveDate() {
  98 + return sieveDate;
  99 + }
  100 +
  101 + public void setSieveDate(Date sieveDate) {
  102 + this.sieveDate = sieveDate;
  103 + }
  104 +
94 105 public String getDuescfs() {
95 106 return duescfs;
96 107 }
... ... @@ -320,6 +331,7 @@
320 331 map.put("patientId",patientId);
321 332 map.put("created",DateUtil.getyyyy_MM_dd(created));
322 333 map.put("modified",DateUtil.getyyyy_MM_dd(modified));
  334 + map.put("sieveDate",DateUtil.getyyyy_MM_dd(sieveDate));
323 335 return map;
324 336 }
325 337 }
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 5f95c21
... ... @@ -187,6 +187,17 @@
187 187  
188 188 private List sieveStatusList;
189 189  
  190 + //用来配合查询新筛实验室列表数据
  191 + private List sieveStatusList2;
  192 +
  193 + public List getSieveStatusList2() {
  194 + return sieveStatusList2;
  195 + }
  196 +
  197 + public void setSieveStatusList2(List sieveStatusList2) {
  198 + this.sieveStatusList2 = sieveStatusList2;
  199 + }
  200 +
190 201 public List getSieveStatusList() {
191 202 return sieveStatusList;
192 203 }
... ... @@ -943,7 +954,9 @@
943 954 }
944 955 if(null != sieveStatusList){
945 956 condition = condition.and("sieveStatus", sieveStatusList, MongoOper.NIN);
946   -
  957 + }
  958 + if(null != sieveStatusList2){
  959 + condition = condition.and("sieveStatus", sieveStatusList2, MongoOper.IN);
947 960 }
948 961  
949 962  
platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java View file @ 5f95c21
... ... @@ -26,8 +26,26 @@
26 26 private String testNumber;//血样码
27 27 private String collectHospitalId;//申请医院（采血单位）
28 28 private String sendCheckHospitalId;//送检医院
29   - private String order;
  29 + private String order;//排序
  30 + private Date sieveDateStart;//筛查开始时间
  31 + private Date sieveDateEnd;//筛查结束时间
30 32  
  33 + public Date getSieveDateStart() {
  34 + return sieveDateStart;
  35 + }
  36 +
  37 + public void setSieveDateStart(Date sieveDateStart) {
  38 + this.sieveDateStart = sieveDateStart;
  39 + }
  40 +
  41 + public Date getSieveDateEnd() {
  42 + return sieveDateEnd;
  43 + }
  44 +
  45 + public void setSieveDateEnd(Date sieveDateEnd) {
  46 + this.sieveDateEnd = sieveDateEnd;
  47 + }
  48 +
31 49 public String getOrder() {
32 50 return order;
33 51 }
... ... @@ -152,6 +170,16 @@
152 170 c = c.lte(applyDateEnd);
153 171 } else {
154 172 c = Criteria.where("created").lte(applyDateEnd);
  173 + }
  174 + }
  175 + if(null != sieveDateStart){
  176 + c = Criteria.where("sieveDate").gte(sieveDateStart);
  177 + }
  178 + if(null != sieveDateEnd){
  179 + if (null != c) {
  180 + c = c.lte(sieveDateEnd);
  181 + } else {
  182 + c = Criteria.where("sieveDate").lte(sieveDateEnd);
155 183 }
156 184 }
157 185  
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java View file @ 5f95c21
... ... @@ -78,7 +78,13 @@
78 78 if(list != null && list.size() > 0){
79 79 for(Patients patients : list){
80 80 try{
  81 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  82 + antExChuQuery.setParentId(patients.getId());
  83 + List<AntExChuModel> aList = antExService.queryAntExChu(antExChuQuery);
81 84 Map<String,String> map = new HashMap<String,String>();
  85 + if(aList != null && aList.size() > 0){
  86 +
  87 + }
82 88 map.put("MATERNALINFOID",patients.getId());
83 89 map.put("NAME",patients.getUsername());
84 90 if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java View file @ 5f95c21
... ... @@ -444,6 +444,7 @@
444 444 */
445 445 public BabySieveManagerResult getBabySieveLab(BabySieveAddRequest babySieveAddRequest){
446 446 int status = 0;
  447 + int sta = 0;
447 448 BabySieveManagerResult babySieveManagerResult = new BabySieveManagerResult();
448 449 BabySieveQuery babySieveQuery = new BabySieveQuery();
449 450 //只能查询出送检医院为本机构的筛查信息
... ... @@ -455,7 +456,7 @@
455 456 babySieveQuery.setOrder("created");
456 457 List<BabySieveModel> babySieveList = babySieveService.getBabySieveQuery(babySieveQuery);
457 458 List<BabySieveManager> babySieveManagerLiat = new ArrayList<BabySieveManager>();
458   - //判断是否有筛查申请及结果数据
  459 + //判断是否有筛查申请及筛查结果数据
459 460 if(babySieveList != null && babySieveList.size() > 0){
460 461 if(StringUtils.isNotEmpty(babySieveAddRequest.getCollectHospitalId())){
461 462 babySieveQuery.setCollectHospitalId(babySieveAddRequest.getCollectHospitalId());
462 463  
463 464  
464 465  
465 466  
466 467  
467 468  
... ... @@ -474,28 +475,188 @@
474 475 babySieveQuery.setTestNumber(babySieveAddRequest.getTestNumber());
475 476 status = 1;
476 477 }
  478 + if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveDate())){
  479 + try {
  480 + babySieveQuery.setSieveDateStart(DateUtil.getSNDate(babySieveAddRequest.getSieveDate())[0]);
  481 + babySieveQuery.setSieveDateEnd(DateUtil.getSNDate(babySieveAddRequest.getSieveDate())[1]);
  482 + status = 1;
  483 + } catch (Exception e) {
  484 + e.printStackTrace();
  485 + }
  486 + }
477 487 if(status == 1){
  488 + int count = 0;
  489 + BabyModelQuery babyModelQuery = new BabyModelQuery();
  490 + if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){
  491 + babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo());
  492 + }
  493 + if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){
  494 + babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus());
  495 + sta = 1;
  496 + }
  497 + babyModelQuery.setDataStatus(false);
  498 + if(sta == 0){
  499 + List<String> sieveList = new ArrayList<String>();
  500 + sieveList.add("1");
  501 + sieveList.add("2");
  502 + sieveList.add("3");
  503 + babyModelQuery.setSieveStatusList2(sieveList);
  504 + }
  505 + List<BabyModel> bayModelList = babyService.queryBabyWithQuery(babyModelQuery);
478 506 List<BabySieveModel> list = babySieveService.getBabySieveQuery(babySieveQuery);
479   - if(list != null && list.size() > 0){
480   - for(BabySieveModel babySieveModel : list){
481   - BabyModelQuery babyModelQuery = new BabyModelQuery();
482   - if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){
483   - babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo());
  507 + babySieveQuery.setNeed(null);
  508 + List<BabySieveModel> bslist = babySieveService.getBabySieveQuery(babySieveQuery);
  509 + for(BabySieveModel bsModel : bslist){
  510 + for(BabyModel bModel : bayModelList){
  511 + if(bsModel.getBabyId().equals(bModel.getId())){
  512 + count += 1;
  513 + continue;
484 514 }
485   - if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){
486   - babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus());
487   - }
488   - babyModelQuery.setDataStatus(false);
489   - babyModelQuery.setId(babySieveModel.getBabyId());
  515 + }
  516 + }
  517 + if(list != null && list.size() > 0){
  518 + for(BabySieveModel babySieveModel : list) {
490 519 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
491   - BabyModel model = null;
492 520 if (babyModelList != null && babyModelList.size() > 0) {
493   - model = babyModelList.get(0);
  521 + for(BabyModel model : babyModelList){
  522 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  523 + matDeliverQuery.setYn(YnEnums.YES.getId());
  524 + matDeliverQuery.setParentId(model.getParentId());
  525 + List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
  526 + if (maternalDeliverModelList != null && maternalDeliverModelList.size() > 0) {
  527 + BabySieveManager babySieveManager = new BabySieveManager();
  528 + babySieveManager.setId(babySieveModel.getId());
  529 + babySieveManager.setTestNumber(babySieveModel.getTestNumber());
  530 + //获取母亲基本信息
  531 + Patients patients = patientsService.findOnePatientById(model.getParentId());
  532 + //获取高危因素，高危评分
  533 + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
  534 + babySieveManager.setRiskFactor(highScoreResult.getHighRisk());
  535 + babySieveManager.setRiskScore(highScoreResult.getScoreStr());
  536 + if (null != patients.getDueDate()) {
  537 + babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
  538 + }
  539 + babySieveManager.setPatientId(patients.getId());
  540 + babySieveManager.setCardNo(patients.getCardNo());
  541 + babySieveManager.setPhone(patients.getPhone());
  542 + babySieveManager.setBabyId(model.getId());
  543 + if (patients.getBirth() != null) {
  544 + babySieveManager.setAge(DateUtil.getAge(patients.getBirth()));
  545 + }
  546 + List<MaternalDeliverModel.Baby> babies = maternalDeliverModelList.get(0).getBaby();
  547 + if (babies != null && babies.size() > 0) {
  548 + for (MaternalDeliverModel.Baby baby : babies) {
  549 + if (StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())) {
  550 + if (maternalDeliverModelList.get(0).getDueWeek() != null) {
  551 + babySieveManager.setDueWeek(maternalDeliverModelList.get(0).getDueWeek());
  552 + }
  553 + String time = baby.getDueTime();
  554 + if (StringUtils.isNotEmpty(time)) {
  555 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
  556 + try {
  557 + Date date = format.parse(time);
  558 + babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(date));
  559 + babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(date));
  560 + } catch (ParseException e) {
  561 + ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time);
  562 + }
  563 + } else {
  564 + babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth()));
  565 + babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth()));
  566 + }
  567 + break;
  568 + }
  569 + }
  570 + } else {
  571 + babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth()));
  572 + babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth()));
  573 + }
  574 +
  575 + babySieveManager.setBabyName(model.getName());
  576 + for (SexEnum sexEnum : SexEnum.values()) {
  577 + if (sexEnum.getId().equals(model.getSex())) {
  578 + babySieveManager.setSex(sexEnum.getText());
  579 + break;
  580 + }
  581 + }
  582 + babySieveManager.setBirthDays(DateUtil.getDays(model.getBirth(), new Date()));
  583 + Integer highRisk = model.getHighRisk();
  584 + if (new Integer(0).equals(highRisk)) {
  585 + babySieveManager.setHighRisk("健康");
  586 + }
  587 + if (new Integer(1).equals(highRisk)) {
  588 + babySieveManager.setHighRisk("高危");
  589 + }
  590 + String dueType = babySieveManager.getDueType();
  591 + if ("1".equals(dueType)) {
  592 + babySieveManager.setDueType("顺产");
  593 + }
  594 + if ("2".equals(dueType)) {
  595 + babySieveManager.setDueType("剖宫产");
  596 + }
  597 + babySieveManager.setSieveStatus(StringUtils.isEmpty(model.getSieveStatus()) ? "0" : model.getSieveStatus());
  598 + babySieveManager.setmName(model.getMname());
  599 +
  600 + babySieveManagerLiat.add(babySieveManager);
  601 + }
  602 + }
  603 + }
  604 + babySieveQuery.mysqlBuild(count);
  605 + babySieveManagerResult.setData(babySieveManagerLiat);
  606 + babySieveManagerResult.setPageInfo(babySieveQuery.getPageInfo());
  607 + babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  608 + babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
  609 + return babySieveManagerResult;
  610 + }
  611 + }else{
  612 + babySieveManagerResult.setData(babySieveManagerLiat);
  613 + babySieveManagerResult.setPageInfo(babyModelQuery.getPageInfo());
  614 + babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  615 + babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
  616 + return babySieveManagerResult;
  617 + }
  618 + }else{
  619 + //记录总数
  620 + int count = 0;
  621 + BabyModelQuery babyModelQuery = new BabyModelQuery();
  622 + if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){
  623 + babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo());
  624 + }
  625 + if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){
  626 + babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus());
  627 + sta = 1;
  628 + }
  629 + babyModelQuery.setDataStatus(false);
  630 + if(sta == 0){
  631 + List<String> sieveList = new ArrayList<String>();
  632 + sieveList.add("1");
  633 + sieveList.add("2");
  634 + sieveList.add("3");
  635 + babyModelQuery.setSieveStatusList2(sieveList);
  636 + }
  637 + //为了分页查询总数据
  638 + babySieveQuery.setNeed(null);
  639 + List<BabySieveModel> list = babySieveService.getBabySieveQuery(babySieveQuery);
  640 + List<BabyModel> bayModelList = babyService.queryBabyWithQuery(babyModelQuery);
  641 + for(BabySieveModel babySieveModel : list){
  642 + for(BabyModel bay : bayModelList){
  643 + if(babySieveModel.getBabyId().equals(bay.getId())){
  644 + count += 1;
  645 + continue;
  646 + }
  647 + }
  648 + }
  649 +
  650 + for(BabySieveModel babySieveModel : babySieveList){
  651 + babyModelQuery.setId(babySieveModel.getBabyId());
  652 + List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
  653 + if (babyModelList != null && babyModelList.size() > 0) {
  654 + for(BabyModel model : babyModelList){
494 655 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
495 656 matDeliverQuery.setYn(YnEnums.YES.getId());
496 657 matDeliverQuery.setParentId(model.getParentId());
497 658 List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
498   - if(maternalDeliverModelList != null && maternalDeliverModelList.size() > 0){
  659 + if (maternalDeliverModelList != null && maternalDeliverModelList.size() > 0) {
499 660 BabySieveManager babySieveManager = new BabySieveManager();
500 661 babySieveManager.setId(babySieveModel.getId());
501 662 babySieveManager.setTestNumber(babySieveModel.getTestNumber());
502 663  
503 664  
504 665  
... ... @@ -505,25 +666,25 @@
505 666 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
506 667 babySieveManager.setRiskFactor(highScoreResult.getHighRisk());
507 668 babySieveManager.setRiskScore(highScoreResult.getScoreStr());
508   - if(null != patients.getDueDate()){
  669 + if (null != patients.getDueDate()) {
509 670 babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
510 671 }
511 672 babySieveManager.setPatientId(patients.getId());
512 673 babySieveManager.setCardNo(patients.getCardNo());
513 674 babySieveManager.setPhone(patients.getPhone());
514 675 babySieveManager.setBabyId(model.getId());
515   - if(patients.getBirth() != null){
  676 + if (patients.getBirth() != null) {
516 677 babySieveManager.setAge(DateUtil.getAge(patients.getBirth()));
517 678 }
518 679 List<MaternalDeliverModel.Baby> babies = maternalDeliverModelList.get(0).getBaby();
519   - if(babies != null && babies.size() > 0){
520   - for(MaternalDeliverModel.Baby baby : babies){
521   - if(StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())){
522   - if(maternalDeliverModelList.get(0).getDueWeek() != null){
  680 + if (babies != null && babies.size() > 0) {
  681 + for (MaternalDeliverModel.Baby baby : babies) {
  682 + if (StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())) {
  683 + if (maternalDeliverModelList.get(0).getDueWeek() != null) {
523 684 babySieveManager.setDueWeek(maternalDeliverModelList.get(0).getDueWeek());
524 685 }
525 686 String time = baby.getDueTime();
526   - if(StringUtils.isNotEmpty(time)){
  687 + if (StringUtils.isNotEmpty(time)) {
527 688 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
528 689 try {
529 690 Date date = format.parse(time);
530 691  
... ... @@ -532,14 +693,14 @@
532 693 } catch (ParseException e) {
533 694 ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time);
534 695 }
535   - }else{
  696 + } else {
536 697 babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth()));
537 698 babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth()));
538 699 }
539 700 break;
540 701 }
541 702 }
542   - }else{
  703 + } else {
543 704 babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth()));
544 705 babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth()));
545 706 }
546 707  
547 708  
548 709  
549 710  
550 711  
... ... @@ -570,124 +731,13 @@
570 731 babySieveManager.setmName(model.getMname());
571 732  
572 733 babySieveManagerLiat.add(babySieveManager);
573   - }
574 734 }
575   -
576   - babySieveManagerResult.setData(babySieveManagerLiat);
577   - babySieveManagerResult.setPageInfo(babyModelQuery.getPageInfo());
578   - babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
579   - babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
580   - return babySieveManagerResult;
581   -
582 735 }
583   - }else{
584   - babySieveManagerResult.setData(babySieveManagerLiat);
585   - babySieveManagerResult.setPageInfo(babySieveQuery.getPageInfo());
586   - babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
587   - babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
588   - return babySieveManagerResult;
589   - }
590   -
591   - }else{
592   - BabyModelQuery babyModelQuery = new BabyModelQuery();
593   - for(BabySieveModel babySieveModel : babySieveList){
594   - if(StringUtils.isNotEmpty(babySieveAddRequest.getQueryNo())){
595   - babyModelQuery.setQueryNo(babySieveAddRequest.getQueryNo());
596 736 }
597   - if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){
598   - babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus());
599   - }
600   - babyModelQuery.setDataStatus(false);
601   - babyModelQuery.setId(babySieveModel.getBabyId());
602   - List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
603   - BabyModel model = null;
604   - if (babyModelList != null && babyModelList.size() > 0) {
605   - model = babyModelList.get(0);
606   - MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
607   - matDeliverQuery.setYn(YnEnums.YES.getId());
608   - matDeliverQuery.setParentId(model.getParentId());
609   - List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
610   - if(maternalDeliverModelList != null && maternalDeliverModelList.size() > 0){
611   - BabySieveManager babySieveManager = new BabySieveManager();
612   - babySieveManager.setId(babySieveModel.getId());
613   - babySieveManager.setTestNumber(babySieveModel.getTestNumber());
614   - //获取母亲基本信息
615   - Patients patients = patientsService.findOnePatientById(model.getParentId());
616   - //获取高危因素，高危评分
617   - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
618   - babySieveManager.setRiskFactor(highScoreResult.getHighRisk());
619   - babySieveManager.setRiskScore(highScoreResult.getScoreStr());
620   - if(null != patients.getDueDate()){
621   - babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
622   - }
623   - babySieveManager.setPatientId(patients.getId());
624   - babySieveManager.setCardNo(patients.getCardNo());
625   - babySieveManager.setPhone(patients.getPhone());
626   - babySieveManager.setBabyId(model.getId());
627   - if(patients.getBirth() != null){
628   - babySieveManager.setAge(DateUtil.getAge(patients.getBirth()));
629   - }
630   - List<MaternalDeliverModel.Baby> babies = maternalDeliverModelList.get(0).getBaby();
631   - if(babies != null && babies.size() > 0){
632   - for(MaternalDeliverModel.Baby baby : babies){
633   - if(StringUtils.isNotEmpty(baby.getId()) && model.getId().equals(baby.getId())){
634   - if(maternalDeliverModelList.get(0).getDueWeek() != null){
635   - babySieveManager.setDueWeek(maternalDeliverModelList.get(0).getDueWeek());
636   - }
637   - String time = baby.getDueTime();
638   - if(StringUtils.isNotEmpty(time)){
639   - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
640   - try {
641   - Date date = format.parse(time);
642   - babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(date));
643   - babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(date));
644   - } catch (ParseException e) {
645   - ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time);
646   - }
647   - }else{
648   - babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth()));
649   - babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth()));
650   - }
651   - break;
652   - }
653   - }
654   - }else{
655   - babySieveManager.setBirthHM(new SimpleDateFormat("HH:mm").format(model.getBirth()));
656   - babySieveManager.setBirthYMD(DateUtil.getyyyy_MM_dd(model.getBirth()));
657   - }
658   -
659   - babySieveManager.setBabyName(model.getName());
660   - for (SexEnum sexEnum : SexEnum.values()) {
661   - if (sexEnum.getId().equals(model.getSex())) {
662   - babySieveManager.setSex(sexEnum.getText());
663   - break;
664   - }
665   - }
666   - babySieveManager.setBirthDays(DateUtil.getDays(model.getBirth(), new Date()));
667   - Integer highRisk = model.getHighRisk();
668   - if (new Integer(0).equals(highRisk)) {
669   - babySieveManager.setHighRisk("健康");
670   - }
671   - if (new Integer(1).equals(highRisk)) {
672   - babySieveManager.setHighRisk("高危");
673   - }
674   - String dueType = babySieveManager.getDueType();
675   - if ("1".equals(dueType)) {
676   - babySieveManager.setDueType("顺产");
677   - }
678   - if ("2".equals(dueType)) {
679   - babySieveManager.setDueType("剖宫产");
680   - }
681   - babySieveManager.setSieveStatus(StringUtils.isEmpty(model.getSieveStatus()) ? "0" : model.getSieveStatus());
682   - babySieveManager.setmName(model.getMname());
683   -
684   - babySieveManagerLiat.add(babySieveManager);
685   - }
686   - }
687 737 }
688   -
  738 + babySieveQuery.mysqlBuild(count);
689 739 babySieveManagerResult.setData(babySieveManagerLiat);
690   - babySieveManagerResult.setPageInfo(babyModelQuery.getPageInfo());
  740 + babySieveManagerResult.setPageInfo(babySieveQuery.getPageInfo());
691 741 babySieveManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
692 742 babySieveManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
693 743 return babySieveManagerResult;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java View file @ 5f95c21
... ... @@ -119,6 +119,17 @@
119 119 //申请时间
120 120 private String applyDate;
121 121  
  122 + //筛查时间
  123 + private String sieveDate;
  124 +
  125 + public String getSieveDate() {
  126 + return sieveDate;
  127 + }
  128 +
  129 + public void setSieveDate(String sieveDate) {
  130 + this.sieveDate = sieveDate;
  131 + }
  132 +
122 133 public String getApplyDate() {
123 134 return applyDate;
124 135 }