Commit c8d07149d0c85856af4f72e81a3bbcf9901bac34
1 parent
bc9c379f21
Exists in
master
and in
6 other branches
隆化11月需求-妇女健康管理-男女婚检 lis对接婚检辅助信息
Showing 5 changed files with 203 additions and 44 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
View file @
c8d0714
| ... | ... | @@ -472,7 +472,7 @@ |
| 472 | 472 | private String abnormalTxt; |
| 473 | 473 | |
| 474 | 474 | /** |
| 475 | - *隆化11月男女婚检需求(1-18男女共用字段,19-27女性特有。) | |
| 475 | + *隆化11月男女婚检需求(1-18男女共用字段,19-26女性特有。) | |
| 476 | 476 | */ |
| 477 | 477 | /**血常规检查*/ |
| 478 | 478 | //白细胞数目1 |
| ... | ... | @@ -536,8 +536,6 @@ |
| 536 | 536 | private String lqj; |
| 537 | 537 | //胺臭味试验26 |
| 538 | 538 | private String acwsy; |
| 539 | - //淋球菌筛查27 | |
| 540 | - private String lqjsc; | |
| 541 | 539 | |
| 542 | 540 | /************************************************************************/ |
| 543 | 541 | |
| ... | ... | @@ -746,14 +744,6 @@ |
| 746 | 744 | |
| 747 | 745 | public void setAcwsy(String acwsy) { |
| 748 | 746 | this.acwsy = acwsy; |
| 749 | - } | |
| 750 | - | |
| 751 | - public String getLqjsc() { | |
| 752 | - return lqjsc; | |
| 753 | - } | |
| 754 | - | |
| 755 | - public void setLqjsc(String lqjsc) { | |
| 756 | - this.lqjsc = lqjsc; | |
| 757 | 747 | } |
| 758 | 748 | |
| 759 | 749 | public Integer getxRay() { |
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
c8d0714
| ... | ... | @@ -9,6 +9,7 @@ |
| 9 | 9 | import com.lyms.platform.permission.model.LisReportItemModel; |
| 10 | 10 | import com.lyms.platform.permission.model.LisReportModel; |
| 11 | 11 | import com.lyms.platform.pojo.PreEugenicsBaseModel; |
| 12 | +import com.lyms.platform.pojo.PremaritalCheckup; | |
| 12 | 13 | import com.lyms.platform.pojo.ResidentsArchiveModel; |
| 13 | 14 | import com.lyms.platform.query.ResidentsArchiveQuery; |
| 14 | 15 | import net.sf.json.JSONObject; |
| ... | ... | @@ -624,6 +625,201 @@ |
| 624 | 625 | Update update = MongoConvertHelper |
| 625 | 626 | .convertToNativeUpdate(ReflectionUtils.getUpdateField(preEugenicsBaseModel)); |
| 626 | 627 | mongoTemplate.updateFirst(query1, update, PreEugenicsBaseModel.class); |
| 628 | + } | |
| 629 | + } | |
| 630 | + } | |
| 631 | + //隆化男女婚检 | |
| 632 | + public void autoHjInLis() | |
| 633 | + { | |
| 634 | + Query query = new Query(); | |
| 635 | + Date start = DateUtil.addDay(new Date(),-15); | |
| 636 | + query.addCriteria(Criteria.where("premaritalUpTime").gte(start)); | |
| 637 | + | |
| 638 | + List <PremaritalCheckup> premaritalCheckupList = mongoTemplate.find(query, PremaritalCheckup.class); | |
| 639 | + System.out.println("autoHjInLis="+premaritalCheckupList.size()); | |
| 640 | + if (CollectionUtils.isNotEmpty(premaritalCheckupList)) | |
| 641 | + { | |
| 642 | + for (PremaritalCheckup premaritalCheckup : premaritalCheckupList) { | |
| 643 | + System.out.println("autoHjInLis CardNo="+premaritalCheckup.getCertificateNum()); | |
| 644 | + List<LisReportModel> lisReportModels = getLhxfyLis(premaritalCheckup.getCertificateNum()); | |
| 645 | + if(CollectionUtils.isNotEmpty(lisReportModels)){ | |
| 646 | + for (LisReportModel model : lisReportModels) { | |
| 647 | + System.out.println("LisReportModel="+model.getLisId()); | |
| 648 | + List<LisReportItemModel> itemModels = model.getItems(); | |
| 649 | + if(CollectionUtils.isNotEmpty(itemModels)){ | |
| 650 | + System.out.println("itemModels="+itemModels.size()); | |
| 651 | + for (LisReportItemModel itemModel : itemModels) { | |
| 652 | + String code = itemModel.getCode(); | |
| 653 | + String result = itemModel.getResult(); | |
| 654 | + | |
| 655 | + switch (code){ | |
| 656 | + /***血常规检查***/ | |
| 657 | + case "WBC": | |
| 658 | + premaritalCheckup.setWbc(result); | |
| 659 | + break; | |
| 660 | + case "RBC": | |
| 661 | + premaritalCheckup.setRbc(result); | |
| 662 | + break; | |
| 663 | + case "PLT": | |
| 664 | + premaritalCheckup.setPlt(result); | |
| 665 | + break; | |
| 666 | + case "HGB": | |
| 667 | + premaritalCheckup.setHgb(result); | |
| 668 | + break; | |
| 669 | + case "NEU%": | |
| 670 | + premaritalCheckup.setNeuB(result); | |
| 671 | + break; | |
| 672 | + case "EOS%": | |
| 673 | + premaritalCheckup.setEosB(result); | |
| 674 | + break; | |
| 675 | + case "BAS%": | |
| 676 | + premaritalCheckup.setBasB(result); | |
| 677 | + break; | |
| 678 | + case "LYM%": | |
| 679 | + premaritalCheckup.setLymB(result); | |
| 680 | + break; | |
| 681 | + case "MON%": | |
| 682 | + premaritalCheckup.setMonB(result); | |
| 683 | + break; | |
| 684 | + /***总胆红素***/ | |
| 685 | + case "001T-BIL": | |
| 686 | + premaritalCheckup.setTbil(result); | |
| 687 | + break; | |
| 688 | + /***直接胆红素***/ | |
| 689 | + case "001D-BIL": | |
| 690 | + premaritalCheckup.setDbil(result); | |
| 691 | + break; | |
| 692 | + /***尿常规检查***/ | |
| 693 | + case "GLU": | |
| 694 | + premaritalCheckup.setGlu(result); | |
| 695 | + break; | |
| 696 | + /***血型***/ | |
| 697 | + case "RH": | |
| 698 | + switch (result){ | |
| 699 | + case "阳性": | |
| 700 | + premaritalCheckup.setRh("1"); | |
| 701 | + break; | |
| 702 | + case "阴性": | |
| 703 | + premaritalCheckup.setRh("2"); | |
| 704 | + break; | |
| 705 | + } | |
| 706 | + break; | |
| 707 | + case "ABO": | |
| 708 | + premaritalCheckup.setAbo(result); | |
| 709 | + break; | |
| 710 | + /***梅毒筛查***/ | |
| 711 | + case "TP-0": | |
| 712 | + switch (result){ | |
| 713 | + case "阳性": | |
| 714 | + premaritalCheckup.setTp("1"); | |
| 715 | + break; | |
| 716 | + case "阴性": | |
| 717 | + premaritalCheckup.setTp("2"); | |
| 718 | + break; | |
| 719 | + } | |
| 720 | + break; | |
| 721 | + /***艾滋病筛查***/ | |
| 722 | + case "HIV": | |
| 723 | + switch (result){ | |
| 724 | + case "阳性": | |
| 725 | + premaritalCheckup.setHiv("1"); | |
| 726 | + break; | |
| 727 | + case "阴性": | |
| 728 | + premaritalCheckup.setHiv("2"); | |
| 729 | + break; | |
| 730 | + } | |
| 731 | + break; | |
| 732 | + /***乙肝表面抗原***/ | |
| 733 | + case "HBSAG": | |
| 734 | + switch (result){ | |
| 735 | + case "阳性": | |
| 736 | + premaritalCheckup.setHbsag("1"); | |
| 737 | + break; | |
| 738 | + case "阴性": | |
| 739 | + premaritalCheckup.setHbsag("2"); | |
| 740 | + break; | |
| 741 | + } | |
| 742 | + break; | |
| 743 | + /***转氨酶***/ | |
| 744 | + case "ALT": | |
| 745 | + premaritalCheckup.setAlt(result); | |
| 746 | + break; | |
| 747 | + /***女性阴道分泌物***/ | |
| 748 | + case "QJD": | |
| 749 | + premaritalCheckup.setQjd(result); | |
| 750 | + break; | |
| 751 | + case "XSXB": | |
| 752 | + switch (result){ | |
| 753 | + case "阳性": | |
| 754 | + premaritalCheckup.setXsxb("1"); | |
| 755 | + break; | |
| 756 | + case "阴性": | |
| 757 | + premaritalCheckup.setXsxb("2"); | |
| 758 | + break; | |
| 759 | + } | |
| 760 | + break; | |
| 761 | + case "DC": | |
| 762 | + switch (result){ | |
| 763 | + case "阳性": | |
| 764 | + premaritalCheckup.setDc("1"); | |
| 765 | + break; | |
| 766 | + case "阴性": | |
| 767 | + premaritalCheckup.setDc("2"); | |
| 768 | + break; | |
| 769 | + } | |
| 770 | + break; | |
| 771 | + case "PH02": | |
| 772 | + premaritalCheckup.setPh(result); | |
| 773 | + break; | |
| 774 | + case "NZJ": | |
| 775 | + switch (result){ | |
| 776 | + case "阳性": | |
| 777 | + premaritalCheckup.setNzj("1"); | |
| 778 | + break; | |
| 779 | + case "阴性": | |
| 780 | + premaritalCheckup.setNzj("2"); | |
| 781 | + break; | |
| 782 | + } | |
| 783 | + break; | |
| 784 | + case "SYYYT": | |
| 785 | + switch (result){ | |
| 786 | + case "阳性": | |
| 787 | + premaritalCheckup.setSyyyt("1"); | |
| 788 | + break; | |
| 789 | + case "阴性": | |
| 790 | + premaritalCheckup.setSyyyt("2"); | |
| 791 | + break; | |
| 792 | + } | |
| 793 | + break; | |
| 794 | + case "LQJ": | |
| 795 | + switch (result){ | |
| 796 | + case "阳性": | |
| 797 | + premaritalCheckup.setLqj("1"); | |
| 798 | + break; | |
| 799 | + case "阴性": | |
| 800 | + premaritalCheckup.setLqj("2"); | |
| 801 | + break; | |
| 802 | + } | |
| 803 | + break; | |
| 804 | + case "ACWSY": | |
| 805 | + switch (result){ | |
| 806 | + case "阳性": | |
| 807 | + premaritalCheckup.setAcwsy("1"); | |
| 808 | + break; | |
| 809 | + case "阴性": | |
| 810 | + premaritalCheckup.setAcwsy("2"); | |
| 811 | + break; | |
| 812 | + } | |
| 813 | + break; | |
| 814 | + } | |
| 815 | + } | |
| 816 | + } | |
| 817 | + } | |
| 818 | + } | |
| 819 | + Query query2 = Query.query(Criteria.where("id").is(premaritalCheckup.getId())); | |
| 820 | + Update update2 = MongoConvertHelper | |
| 821 | + .convertToNativeUpdate(ReflectionUtils.getUpdateField(premaritalCheckup)); | |
| 822 | + mongoTemplate.updateFirst(query2, update2, PremaritalCheckup.class); | |
| 627 | 823 | } |
| 628 | 824 | } |
| 629 | 825 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
View file @
c8d0714
| ... | ... | @@ -461,7 +461,7 @@ |
| 461 | 461 | private String abnormalTxt; |
| 462 | 462 | |
| 463 | 463 | /** |
| 464 | - *隆化11月男女婚检需求(1-18男女共用字段,19-27女性特有。) | |
| 464 | + *隆化11月男女婚检需求(1-18男女共用字段,19-26女性特有。) | |
| 465 | 465 | */ |
| 466 | 466 | /**血常规检查*/ |
| 467 | 467 | //白细胞数目1 |
| ... | ... | @@ -525,8 +525,7 @@ |
| 525 | 525 | private String lqj; |
| 526 | 526 | //胺臭味试验26 |
| 527 | 527 | private String acwsy; |
| 528 | - //淋球菌筛查27 | |
| 529 | - private String lqjsc; | |
| 528 | + | |
| 530 | 529 | /************************************************************************/ |
| 531 | 530 | |
| 532 | 531 | public String getWbc() { |
| ... | ... | @@ -735,14 +734,6 @@ |
| 735 | 734 | |
| 736 | 735 | public void setAcwsy(String acwsy) { |
| 737 | 736 | this.acwsy = acwsy; |
| 738 | - } | |
| 739 | - | |
| 740 | - public String getLqjsc() { | |
| 741 | - return lqjsc; | |
| 742 | - } | |
| 743 | - | |
| 744 | - public void setLqjsc(String lqjsc) { | |
| 745 | - this.lqjsc = lqjsc; | |
| 746 | 737 | } |
| 747 | 738 | |
| 748 | 739 | public Integer getxRay() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
View file @
c8d0714
| ... | ... | @@ -425,7 +425,7 @@ |
| 425 | 425 | private String abnormalTxt; |
| 426 | 426 | |
| 427 | 427 | /** |
| 428 | - *隆化11月男女婚检需求(1-18男女共用字段,19-27女性特有。) | |
| 428 | + *隆化11月男女婚检需求(1-18男女共用字段,19-26女性特有。) | |
| 429 | 429 | */ |
| 430 | 430 | /**血常规检查*/ |
| 431 | 431 | //白细胞数目1 |
| ... | ... | @@ -489,8 +489,7 @@ |
| 489 | 489 | private String lqj; |
| 490 | 490 | //胺臭味试验26 |
| 491 | 491 | private String acwsy; |
| 492 | - //淋球菌筛查27 | |
| 493 | - private String lqjsc; | |
| 492 | + | |
| 494 | 493 | /************************************************************************/ |
| 495 | 494 | |
| 496 | 495 | public String getWbc() { |
| ... | ... | @@ -699,14 +698,6 @@ |
| 699 | 698 | |
| 700 | 699 | public void setAcwsy(String acwsy) { |
| 701 | 700 | this.acwsy = acwsy; |
| 702 | - } | |
| 703 | - | |
| 704 | - public String getLqjsc() { | |
| 705 | - return lqjsc; | |
| 706 | - } | |
| 707 | - | |
| 708 | - public void setLqjsc(String lqjsc) { | |
| 709 | - this.lqjsc = lqjsc; | |
| 710 | 701 | } |
| 711 | 702 | |
| 712 | 703 | public Integer getxRay() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
View file @
c8d0714
| ... | ... | @@ -436,7 +436,7 @@ |
| 436 | 436 | private String abnormalTxt; |
| 437 | 437 | |
| 438 | 438 | /** |
| 439 | - *隆化11月男女婚检需求(1-18男女共用字段,19-27女性特有。) | |
| 439 | + *隆化11月男女婚检需求(1-18男女共用字段,19-26女性特有。) | |
| 440 | 440 | */ |
| 441 | 441 | /**血常规检查*/ |
| 442 | 442 | //白细胞数目1 |
| ... | ... | @@ -500,8 +500,7 @@ |
| 500 | 500 | private String lqj; |
| 501 | 501 | //胺臭味试验26 |
| 502 | 502 | private String acwsy; |
| 503 | - //淋球菌筛查27 | |
| 504 | - private String lqjsc; | |
| 503 | + | |
| 505 | 504 | /************************************************************************/ |
| 506 | 505 | public String getLhHiv() { |
| 507 | 506 | return lhHiv; |
| ... | ... | @@ -709,14 +708,6 @@ |
| 709 | 708 | |
| 710 | 709 | public void setAcwsy(String acwsy) { |
| 711 | 710 | this.acwsy = acwsy; |
| 712 | - } | |
| 713 | - | |
| 714 | - public String getLqjsc() { | |
| 715 | - return lqjsc; | |
| 716 | - } | |
| 717 | - | |
| 718 | - public void setLqjsc(String lqjsc) { | |
| 719 | - this.lqjsc = lqjsc; | |
| 720 | 711 | } |
| 721 | 712 | |
| 722 | 713 | public Integer getxRay() { |