jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 855ba694189b0fd3cb975b3eeb6ddcb3fda915fd

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

update

Showing 1 changed file with 44 additions and 72 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 855ba69
... ... @@ -100,7 +100,7 @@
100 100 {
101 101 Query query = new Query();
102 102 Date start = DateUtil.addDay(new Date(),-15);
103   - query.addCriteria(Criteria.where("fillDate").gte(start));
  103 + query.addCriteria(Criteria.where("fillDate").gte(start).and("hospitalId").is("2100001605"));//隆化定制
104 104  
105 105 List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);
106 106 System.out.println("autoInLis="+preEugenicsBaseModels.size());
107 107  
... ... @@ -627,13 +627,15 @@
627 627 mongoTemplate.updateFirst(query1, update, PreEugenicsBaseModel.class);
628 628 }
629 629 }
  630 + //隆化-妇女健康管理-男女婚检lis检查结果获取
  631 + autoHjInLis();
630 632 }
631 633 //隆化-妇女健康管理-男女婚检lis检查结果获取
632 634 public void autoHjInLis()
633 635 {
634 636 Query query = new Query();
635 637 Date start = DateUtil.addDay(new Date(),-15);
636   - query.addCriteria(Criteria.where("premaritalUpTime").gte(start));
  638 + query.addCriteria(Criteria.where("premaritalUpTime").gte(start).and("hospitalId").is("2100001605"));//隆化定制
637 639 //查询15天前院内婚检档案
638 640 List <PremaritalCheckup> premaritalCheckupList = mongoTemplate.find(query, PremaritalCheckup.class);
639 641 if (CollectionUtils.isNotEmpty(premaritalCheckupList))
... ... @@ -694,13 +696,10 @@
694 696 break;
695 697 /***血型***/
696 698 case "RH":
697   - switch (result){
698   - case "阳性":
699   - premaritalCheckup.setRh("1");
700   - break;
701   - case "阴性":
702   - premaritalCheckup.setRh("2");
703   - break;
  699 + if(result.contains("阳性")) {
  700 + premaritalCheckup.setRh("1");
  701 + }else if(result.contains("阴性")) {
  702 + premaritalCheckup.setRh("2");
704 703 }
705 704 break;
706 705 case "ABO":
707 706  
708 707  
... ... @@ -708,35 +707,26 @@
708 707 break;
709 708 /***梅毒筛查***/
710 709 case "TP-0":
711   - switch (result){
712   - case "阳性":
713   - premaritalCheckup.setTp("1");
714   - break;
715   - case "阴性":
716   - premaritalCheckup.setTp("2");
717   - break;
  710 + if(result.contains("阳性")) {
  711 + premaritalCheckup.setTp("1");
  712 + }else if(result.contains("阴性")) {
  713 + premaritalCheckup.setTp("2");
718 714 }
719 715 break;
720 716 /***艾滋病筛查***/
721 717 case "HIV":
722   - switch (result){
723   - case "阳性":
724   - premaritalCheckup.setHiv("1");
725   - break;
726   - case "阴性":
727   - premaritalCheckup.setHiv("2");
728   - break;
  718 + if(result.contains("阳性")) {
  719 + premaritalCheckup.setHiv("1");
  720 + }else if(result.contains("阴性")) {
  721 + premaritalCheckup.setHiv("2");
729 722 }
730 723 break;
731 724 /***乙肝表面抗原***/
732 725 case "HBSAG":
733   - switch (result){
734   - case "阳性":
735   - premaritalCheckup.setHbsag("1");
736   - break;
737   - case "阴性":
738   - premaritalCheckup.setHbsag("2");
739   - break;
  726 + if(result.contains("阳性")) {
  727 + premaritalCheckup.setHbsag("1");
  728 + }else if(result.contains("阴性")) {
  729 + premaritalCheckup.setHbsag("2");
740 730 }
741 731 break;
742 732 /***转氨酶***/
743 733  
744 734  
745 735  
746 736  
747 737  
... ... @@ -748,66 +738,48 @@
748 738 premaritalCheckup.setQjd(result);
749 739 break;
750 740 case "XSXB":
751   - switch (result){
752   - case "阳性":
753   - premaritalCheckup.setXsxb("1");
754   - break;
755   - case "阴性":
756   - premaritalCheckup.setXsxb("2");
757   - break;
  741 + if(result.contains("阳性")) {
  742 + premaritalCheckup.setXsxb("1");
  743 + }else if(result.contains("阴性")) {
  744 + premaritalCheckup.setXsxb("2");
758 745 }
759 746 break;
760 747 case "DC":
761   - switch (result){
762   - case "阳性":
763   - premaritalCheckup.setDc("1");
764   - break;
765   - case "阴性":
766   - premaritalCheckup.setDc("2");
767   - break;
  748 + if(result.contains("阳性")) {
  749 + premaritalCheckup.setDc("1");
  750 + }else if(result.contains("阴性")) {
  751 + premaritalCheckup.setDc("2");
768 752 }
769 753 break;
770 754 case "PH02":
771 755 premaritalCheckup.setPh(result);
772 756 break;
773 757 case "NZJ":
774   - switch (result){
775   - case "阳性":
776   - premaritalCheckup.setNzj("1");
777   - break;
778   - case "阴性":
779   - premaritalCheckup.setNzj("2");
780   - break;
  758 + if(result.contains("阳性")) {
  759 + premaritalCheckup.setNzj("1");
  760 + }else if(result.contains("阴性")) {
  761 + premaritalCheckup.setNzj("2");
781 762 }
782 763 break;
783 764 case "SYYYT":
784   - switch (result){
785   - case "阳性":
786   - premaritalCheckup.setSyyyt("1");
787   - break;
788   - case "阴性":
789   - premaritalCheckup.setSyyyt("2");
790   - break;
  765 + if(result.contains("阳性")) {
  766 + premaritalCheckup.setSyyyt("1");
  767 + }else if(result.contains("阴性")) {
  768 + premaritalCheckup.setSyyyt("2");
791 769 }
792 770 break;
793 771 case "LQJ":
794   - switch (result){
795   - case "阳性":
796   - premaritalCheckup.setLqj("1");
797   - break;
798   - case "阴性":
799   - premaritalCheckup.setLqj("2");
800   - break;
  772 + if(result.contains("阳性")) {
  773 + premaritalCheckup.setLqj("1");
  774 + }else if(result.contains("阴性")) {
  775 + premaritalCheckup.setLqj("2");
801 776 }
802 777 break;
803 778 case "ACWSY":
804   - switch (result){
805   - case "阳性":
806   - premaritalCheckup.setAcwsy("1");
807   - break;
808   - case "阴性":
809   - premaritalCheckup.setAcwsy("2");
810   - break;
  779 + if(result.contains("阳性")) {
  780 + premaritalCheckup.setAcwsy("1");
  781 + }else if(result.contains("阴性")) {
  782 + premaritalCheckup.setAcwsy("2");
811 783 }
812 784 break;
813 785 }