jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7c7e9b3d414b79786c98ef5224248711827873aa

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

两癌

Showing 4 changed files with 192 additions and 100 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/PositionEnums.java View file @ 7c7e9b3
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import com.lyms.platform.common.utils.StringUtils;
  4 +
  5 +public enum PositionEnums {
  6 + //1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改
  7 + IN(1, "录入"),
  8 + AREA(2, "县(行政审核)"),
  9 + CITY(3, "市(行政审核)"),
  10 + PROVINCE(4, "省(行政审核)"),
  11 + COUNTRY(5, "国家(行政审核)"),
  12 + UPDATE(6, "驳回待修改"),
  13 + UPDATED(7, "驳回已修改");
  14 + private PositionEnums(int id, String title) {
  15 + this.id = id;
  16 + this.title = title;
  17 + }
  18 +
  19 + private int id;
  20 +
  21 + private String title;
  22 + public static String getName(Integer id) {
  23 + if(id == null) {
  24 + return null;
  25 + }
  26 + PositionEnums[] values = PositionEnums.values();
  27 + for (PositionEnums value : values) {
  28 + if (value.id == id) {
  29 + return value.title;
  30 + }
  31 + }
  32 + return null;
  33 + }
  34 + public PositionEnums getEnum(int id) {
  35 + for (PositionEnums yn : values()) {
  36 + if (yn.getId() == id) {
  37 + return yn;
  38 + }
  39 + }
  40 + return null;
  41 + }
  42 +
  43 + public int getId() {
  44 + return id;
  45 + }
  46 +
  47 + public String getTitle() {
  48 + return title;
  49 + }
  50 +}
platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java View file @ 7c7e9b3
... ... @@ -30,7 +30,7 @@
30 30 private Integer yn;
31 31  
32 32 private Date examineDate;//审核时间/驳回时间
33   - private Integer position;// 审核级别 1 录入 2 县 3 市 4 省 5 国家 6 驳回待修改 7 驳回已修改
  33 + private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改
34 34  
35 35 public Date getExamineDate() {
36 36 return examineDate;
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 7c7e9b3
... ... @@ -751,79 +751,99 @@
751 751 switch (code){
752 752 /***血常规检查***/
753 753 case "WBC":
754   - premaritalCheckup.setWbc(result);
  754 + if(StringUtils.isEmpty(premaritalCheckup.getWbc()))
  755 + {
  756 + premaritalCheckup.setWbc(result);
  757 + }
755 758 break;
756 759 case "RBC":
757   - premaritalCheckup.setRbc(result);
  760 + if(StringUtils.isEmpty(premaritalCheckup.getRbc())) {
  761 + premaritalCheckup.setRbc(result);
  762 + }
758 763 break;
759 764 case "PLT":
760   - premaritalCheckup.setPlt(result);
  765 + if(StringUtils.isEmpty(premaritalCheckup.getPlt())) {
  766 + premaritalCheckup.setPlt(result);
  767 + }
761 768 break;
762 769 case "HGB":
763   - premaritalCheckup.setHgb(result);
  770 + if(StringUtils.isEmpty(premaritalCheckup.getHgb())) {
  771 + premaritalCheckup.setHgb(result);
  772 + }
764 773 break;
765 774 case "NEU%":
766   - premaritalCheckup.setNeuB(result);
  775 + if(StringUtils.isEmpty(premaritalCheckup.getNeuB())) {
  776 + premaritalCheckup.setNeuB(result);
  777 + }
767 778 break;
768 779 case "EOS%":
769   - premaritalCheckup.setEosB(result);
  780 + if(StringUtils.isEmpty(premaritalCheckup.getEosB())) {
  781 + premaritalCheckup.setEosB(result);
  782 + }
770 783 break;
771 784 case "BAS%":
772   - premaritalCheckup.setBasB(result);
  785 + if(StringUtils.isEmpty(premaritalCheckup.getBasB())) {
  786 + premaritalCheckup.setBasB(result);
  787 + }
773 788 break;
774 789 case "LYM%":
775   - premaritalCheckup.setLymB(result);
  790 + if(StringUtils.isEmpty(premaritalCheckup.getLymB())) {
  791 + premaritalCheckup.setLymB(result);
  792 + }
776 793 break;
777 794 case "MON%":
778   - premaritalCheckup.setMonB(result);
  795 + if(StringUtils.isEmpty(premaritalCheckup.getMonB())) {
  796 + premaritalCheckup.setMonB(result);
  797 + }
779 798 break;
780 799 /***总胆红素***/
781 800 case "001T-BIL":
782   - premaritalCheckup.setTbil(result);
  801 + if(StringUtils.isEmpty(premaritalCheckup.getTbil())) {
  802 + premaritalCheckup.setTbil(result);
  803 + }
783 804 break;
784 805 /***直接胆红素***/
785 806 case "001D-BIL":
786   - premaritalCheckup.setDbil(result);
  807 + if(StringUtils.isEmpty(premaritalCheckup.getDbil())) {
  808 + premaritalCheckup.setDbil(result);
  809 + }
787 810 break;
788   -// /***尿常规检查***/
789   -// case "GLU02":
790   -// if(result.equals("- 0"))
791   -// {
792   -// premaritalCheckup.setGlu("阴性");
793   -// }
794   -// else
795   -// {
796   -// premaritalCheckup.setGlu("阳性");
797   -// }
798   -// break;
799 811 /***血型***/
800 812 case "RH":
801   - if(result.contains("阳性")) {
802   - premaritalCheckup.setRh("1");
803   - }else if(result.contains("阴性")) {
804   - premaritalCheckup.setRh("2");
  813 + if(StringUtils.isEmpty(premaritalCheckup.getRh())) {
  814 + if(result.contains("阳性")) {
  815 + premaritalCheckup.setRh("1");
  816 + }else if(result.contains("阴性")) {
  817 + premaritalCheckup.setRh("2");
  818 + }
805 819 }
806 820 break;
807 821 /***血型***/
808 822 case "RHD":
809   - if(result.contains("阳性")) {
810   - premaritalCheckup.setRh("1");
811   - }else if(result.contains("阴性")) {
812   - premaritalCheckup.setRh("2");
  823 + if(StringUtils.isEmpty(premaritalCheckup.getRh())) {
  824 + if(result.contains("阳性")) {
  825 + premaritalCheckup.setRh("1");
  826 + }else if(result.contains("阴性")) {
  827 + premaritalCheckup.setRh("2");
  828 + }
813 829 }
814 830 break;
815 831 case "ABO":
816   - premaritalCheckup.setAbo(result);
  832 + if(StringUtils.isEmpty(premaritalCheckup.getAbo())) {
  833 + premaritalCheckup.setAbo(result);
  834 + }
817 835 break;
818 836 /***梅毒筛查***/
819 837  
820   - case "TP-1":
821   - if(result.contains("阳性")) {
822   - premaritalCheckup.setTp("1");
823   - }else if(result.contains("阴性")) {
824   - premaritalCheckup.setTp("2");
825   - }
826   - break;
  838 +// case "TP-1":
  839 +// if(StringUtils.isEmpty(premaritalCheckup.getTp())) {
  840 +// if(result.contains("阳性")) {
  841 +// premaritalCheckup.setTp("1");
  842 +// }else if(result.contains("阴性")) {
  843 +// premaritalCheckup.setTp("2");
  844 +// }
  845 +// }
  846 +// break;
827 847 /***艾滋病筛查***/
828 848 // case "HIV":
829 849 // if(result.contains("阳性")) {
830 850  
831 851  
832 852  
833 853  
... ... @@ -833,41 +853,51 @@
833 853 // }
834 854 // break;
835 855 /***乙肝表面抗原***/
836   - case "HBSAG-1":
837   - if(result.contains("阳性")) {
838   - premaritalCheckup.setHbsag("1");
839   - }else if(result.contains("阴性")) {
840   - premaritalCheckup.setHbsag("2");
841   - }
842   - break;
  856 +// case "HBSAG-1":
  857 +// if(StringUtils.isEmpty(premaritalCheckup.getHbsag())) {
  858 +// if(result.contains("阳性")) {
  859 +// premaritalCheckup.setHbsag("1");
  860 +// }else if(result.contains("阴性")) {
  861 +// premaritalCheckup.setHbsag("2");
  862 +// }
  863 +// }
  864 +// break;
843 865 /***转氨酶***/
844 866 case "001ALT":
845   - premaritalCheckup.setAlt(result);
  867 + if(StringUtils.isEmpty(premaritalCheckup.getAlt())) {
  868 + premaritalCheckup.setAlt(result);
  869 + }
846 870 break;
847 871 /***女性阴道分泌物***/
848 872 case "QJD":
849   - if (result.equals("I") || result.equals("Ⅰ")) {
850   - premaritalCheckup.setQjd("1");
851   - } else if (result.equals("II") || result.equals("Ⅱ")) {
852   - premaritalCheckup.setQjd("2");
853   - } else if (result.equals("Ⅲ") || result.equals("III")) {
854   - premaritalCheckup.setQjd("3");
855   - } else if (result.equals("IV") || result.equals("IV")) {
856   - premaritalCheckup.setQjd("4");
  873 + if(StringUtils.isEmpty(premaritalCheckup.getQjd())) {
  874 + if (result.equals("I") || result.equals("Ⅰ")) {
  875 + premaritalCheckup.setQjd("1");
  876 + } else if (result.equals("II") || result.equals("Ⅱ")) {
  877 + premaritalCheckup.setQjd("2");
  878 + } else if (result.equals("Ⅲ") || result.equals("III")) {
  879 + premaritalCheckup.setQjd("3");
  880 + } else if (result.equals("IV") || result.equals("IV")) {
  881 + premaritalCheckup.setQjd("4");
  882 + }
857 883 }
858 884 break;
859 885 case "XSXB":
860   - if(result.contains("阳性")) {
861   - premaritalCheckup.setXsxb("1");
862   - }else if(result.contains("阴性")) {
863   - premaritalCheckup.setXsxb("2");
  886 + if(StringUtils.isEmpty(premaritalCheckup.getXsxb())) {
  887 + if(result.contains("阳性")) {
  888 + premaritalCheckup.setXsxb("1");
  889 + }else if(result.contains("阴性")) {
  890 + premaritalCheckup.setXsxb("2");
  891 + }
864 892 }
865 893 break;
866 894 case "DC":
867   - if(result.contains("阳性")) {
868   - premaritalCheckup.setDc("1");
869   - }else if(result.contains("阴性")) {
870   - premaritalCheckup.setDc("2");
  895 + if(StringUtils.isEmpty(premaritalCheckup.getDc())) {
  896 + if(result.contains("阳性")) {
  897 + premaritalCheckup.setDc("1");
  898 + }else if(result.contains("阴性")) {
  899 + premaritalCheckup.setDc("2");
  900 + }
871 901 }
872 902 break;
873 903 case "PH02":
874 904  
875 905  
876 906  
877 907  
... ... @@ -889,32 +919,41 @@
889 919 }
890 920 break;
891 921 case "NZJ":
892   - if(result.contains("阳性")) {
893   - premaritalCheckup.setNzj("1");
894   - }else if(result.contains("阴性")) {
895   - premaritalCheckup.setNzj("2");
  922 + if(StringUtils.isEmpty(premaritalCheckup.getNzj())) {
  923 + if(result.contains("阳性")) {
  924 + premaritalCheckup.setNzj("1");
  925 + }else if(result.contains("阴性")) {
  926 + premaritalCheckup.setNzj("2");
  927 + }
896 928 }
897 929 break;
898 930 case "SYYYT":
899   - if(result.contains("阳性")) {
900   - premaritalCheckup.setSyyyt("1");
901   - }else if(result.contains("阴性")) {
902   - premaritalCheckup.setSyyyt("2");
  931 + if (StringUtils.isEmpty(premaritalCheckup.getSyyyt())) {
  932 + if (result.contains("阳性")) {
  933 + premaritalCheckup.setSyyyt("1");
  934 + } else if (result.contains("阴性")) {
  935 + premaritalCheckup.setSyyyt("2");
  936 + }
903 937 }
904 938 break;
905 939 case "LQJ":
906   - if(result.contains("阳性")) {
907   - premaritalCheckup.setLqj("1");
908   - }else if(result.contains("阴性")) {
909   - premaritalCheckup.setLqj("2");
  940 + if (StringUtils.isEmpty(premaritalCheckup.getLqj())) {
  941 + if(result.contains("阳性")) {
  942 + premaritalCheckup.setLqj("1");
  943 + }else if(result.contains("阴性")) {
  944 + premaritalCheckup.setLqj("2");
  945 + }
910 946 }
911 947 break;
912 948 case "ACWSY":
913   - if(result.contains("阳性")) {
914   - premaritalCheckup.setAcwsy("1");
915   - }else if(result.contains("阴性")) {
916   - premaritalCheckup.setAcwsy("2");
  949 + if (StringUtils.isEmpty(premaritalCheckup.getAcwsy())) {
  950 + if(result.contains("阳性")) {
  951 + premaritalCheckup.setAcwsy("1");
  952 + }else if(result.contains("阴性")) {
  953 + premaritalCheckup.setAcwsy("2");
  954 + }
917 955 }
  956 +
918 957 break;
919 958 }
920 959 }
921 960  
922 961  
923 962  
... ... @@ -922,13 +961,24 @@
922 961 }
923 962 }
924 963 /**梅毒***/
925   - premaritalCheckup.setTp("2");
  964 + if (StringUtils.isEmpty(premaritalCheckup.getTp())) {
  965 + premaritalCheckup.setTp("2");
  966 + }
926 967 /***艾滋病筛查***/
927   - premaritalCheckup.setLhHiv("2");
  968 + if (StringUtils.isEmpty(premaritalCheckup.getLhHiv())) {
  969 + premaritalCheckup.setLhHiv("2");
  970 + }
  971 +
928 972 /***乙肝表面抗原***/
929   - premaritalCheckup.setHbsag("2");
  973 + if (StringUtils.isEmpty(premaritalCheckup.getHbsag())) {
  974 + premaritalCheckup.setHbsag("2");
  975 + }
  976 +
930 977 //尿常规
931   - premaritalCheckup.setGlu("阴性");
  978 + if (StringUtils.isEmpty(premaritalCheckup.getGlu())) {
  979 + premaritalCheckup.setGlu("阴性");
  980 + }
  981 +
932 982 //检查结果更新到个人档案
933 983 Query query2 = Query.query(Criteria.where("id").is(premaritalCheckup.getId()));
934 984 Update update2 = MongoConvertHelper
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 7c7e9b3
... ... @@ -1013,8 +1013,9 @@
1013 1013 cancerExamineModel.setProvinceId(organization.getProvinceId());
1014 1014 cancerExamineModel.setCityId(organization.getCityId());
1015 1015 cancerExamineModel.setAreaId(organization.getAreaId());
1016   - cancerExamineModel.setYearQuarter(cancerExamineModel.getYear()+cancerExamineModel.getQuarter());
  1016 + cancerExamineModel.setYearQuarter(Integer.parseInt(String.valueOf(cancerExamineModel.getYear())+cancerExamineModel.getQuarter()));
1017 1017 cancerExamineModel.setYn(YnEnums.YES.getId());
  1018 + cancerExamineModel.setPosition(1);
1018 1019 mongoTemplate.save(cancerExamineModel);
1019 1020 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1020 1021 }
1021 1022  
... ... @@ -1032,21 +1033,11 @@
1032 1033 {
1033 1034 Criteria c = Criteria.where("areaId").is(organization.getAreaId());
1034 1035 query.addCriteria(c);
1035   - if (request.getPosition() != null)
1036   - {
1037   - Criteria c1 = Criteria.where("position").is(request.getPosition());
1038   - query.addCriteria(c1);
1039   - }
1040 1036 }
1041 1037 else if (request.getPosition() == 3)
1042 1038 {
1043 1039 Criteria c = Criteria.where("cityId").is(organization.getCityId());
1044 1040 query.addCriteria(c);
1045   - if (request.getPosition() != null)
1046   - {
1047   - Criteria c1 = Criteria.where("position").is(request.getPosition());
1048   - query.addCriteria(c1);
1049   - }
1050 1041 }
1051 1042  
1052 1043 if (StringUtils.isNotEmpty(request.getOptDate())) {
1053 1044  
... ... @@ -1065,12 +1056,14 @@
1065 1056 query.addCriteria(Criteria.where("examineDate").gte(start).lte(end));
1066 1057 }
1067 1058  
  1059 + if (request.getStartYear() != null && request.getEndYear() != null && request.getStartQuarter() != null && request.getEndquarter() != null) {
  1060 + Integer yearQuarterStart = Integer.parseInt(String.valueOf(request.getStartYear())+request.getStartQuarter());
  1061 + Integer yearQuarterEnd = Integer.parseInt(String.valueOf(request.getEndYear())+request.getEndquarter());
  1062 + query.addCriteria(Criteria.where("yearQuarter").gte(yearQuarterStart).lte(yearQuarterEnd));
  1063 + }
1068 1064 if (request.getStartYear() != null && request.getEndYear() != null) {
1069 1065 query.addCriteria(Criteria.where("year").gte(request.getStartYear()).lte(request.getEndYear()));
1070 1066 }
1071   - if (request.getStartQuarter() != null && request.getEndquarter() != null) {
1072   - query.addCriteria(Criteria.where("quarter").gte(request.getStartQuarter()).lte(request.getEndquarter()));
1073   - }
1074 1067 if (StringUtils.isNotEmpty(request.getOptUser()))
1075 1068 {
1076 1069 Criteria c = Criteria.where("optUser").is(request.getOptUser());
... ... @@ -1102,8 +1095,7 @@
1102 1095 data.put("optUser",cancer.getOptUser());
1103 1096 data.put("optDate",DateUtil.getyyyy_MM_dd(cancer.getOptDate()));
1104 1097 data.put("examineDate",DateUtil.getyyyy_MM_dd(cancer.getExamineDate()));
1105   - data.put("positionStr",cancer.getPosition() == 1 ? "机构" : (cancer.getPosition() == 2 ? "县级" : "市级"));
1106   -
  1098 + data.put("positionStr",PositionEnums.getName(cancer.getPosition()));
1107 1099 data.put("provinceId",cancer.getProvinceId());
1108 1100 data.put("cityId",cancer.getCityId());
1109 1101 data.put("areaId",cancer.getAreaId());
... ... @@ -1141,7 +1133,7 @@
1141 1133 for (CancerExamineRecordModel model : list)
1142 1134 {
1143 1135 Map data = new LinkedHashMap();
1144   - data.put("examineLevel",model.getExamineLevel() == 2 ? "县" : "市");
  1136 + data.put("examineLevel", PositionEnums.getName(model.getExamineLevel()));
1145 1137 data.put("result",model.getReasult() == 2 ? "通过" : "驳回");
1146 1138 data.put("backReason",model.getBackReason() == null ? "" : model.getBackReason());
1147 1139 data.put("examineDate",DateUtil.getyyyy_MM_dd(model.getExamineDate()));