jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fb30a9a82ec3d6fa599449c2c10617b250fa5e6e

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

统计

Showing 2 changed files with 264 additions and 51 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java View file @ fb30a9a
... ... @@ -932,9 +932,10 @@
932 932 public BaseResponse getBabyFmList1(HttpServletRequest request,
933 933 Integer page, Integer limit,
934 934 @RequestParam( required = false) String hospitalId,
  935 + @RequestParam( required = false) String streetId,
935 936 @RequestParam Integer type, // 1本月活产 2累计活产
936 937 @RequestParam Date dateTime) {
937   - return patientSyncMysqlFacade.getBabyFmList1(page,limit,hospitalId,dateTime,type);
  938 + return patientSyncMysqlFacade.getBabyFmList1(page,limit,hospitalId,streetId,dateTime,type);
938 939 }
939 940 /**
940 941 * 新生儿访视
941 942  
... ... @@ -951,10 +952,11 @@
951 952 public BaseResponse getBabyFsList1(HttpServletRequest request,
952 953 Integer page, Integer limit,
953 954 @RequestParam( required = false) String hospitalId,
  955 + @RequestParam( required = false) String streetId,
954 956 @RequestParam Integer type, // 1本月访视 2累计访视
955 957 @RequestParam Date dateTime) {
956 958 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
957   - return patientSyncMysqlFacade.getBabyFsList1(page,limit,hospitalId,dateTime,type);
  959 + return patientSyncMysqlFacade.getBabyFsList1(page,limit,hospitalId,streetId,dateTime,type);
958 960 }
959 961  
960 962 /**
961 963  
... ... @@ -972,12 +974,13 @@
972 974 public BaseResponse getBabyBuildCountList1(HttpServletRequest request,
973 975 Integer page, Integer limit,
974 976 @RequestParam( required = false) String hospitalId,
  977 + @RequestParam( required = false) String streetId,
975 978 @RequestParam Integer type, // 1 0-3岁总数 2 0-6岁总数
976 979 @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge,
977 980 @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge,
978 981 @RequestParam Date dateTime) {
979 982 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
980   - return patientSyncMysqlFacade.getBabyBuildCountList1(page,limit,hospitalId,dateTime,type,startMonthAge,endMonthAge);
  983 + return patientSyncMysqlFacade.getBabyBuildCountList1(page,limit,hospitalId,streetId,dateTime,type,startMonthAge,endMonthAge);
981 984 }
982 985  
983 986  
984 987  
... ... @@ -996,10 +999,11 @@
996 999 public BaseResponse getBabySystemCountList1(HttpServletRequest request,
997 1000 Integer page, Integer limit,
998 1001 @RequestParam( required = false) String hospitalId,
  1002 + @RequestParam( required = false) String streetId,
999 1003 @RequestParam Integer type, // 1 0-3岁儿童系统管理人数 2 0-6岁儿童系统管理人数
1000 1004 @RequestParam Date dateTime) {
1001 1005 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1002   - return patientSyncMysqlFacade.getBabySystemCountList1(page,limit,hospitalId,dateTime,type);
  1006 + return patientSyncMysqlFacade.getBabySystemCountList1(page,limit,hospitalId,streetId,dateTime,type);
1003 1007 }
1004 1008  
1005 1009  
1006 1010  
... ... @@ -1017,9 +1021,10 @@
1017 1021 public BaseResponse getBabyHealthList1(HttpServletRequest request,
1018 1022 Integer page, Integer limit,
1019 1023 @RequestParam( required = false) String hospitalId,
  1024 + @RequestParam( required = false) String streetId,
1020 1025 @RequestParam Date dateTime) {
1021 1026 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1022   - return patientSyncMysqlFacade.getBabyHealthList1(page,limit,hospitalId,dateTime);
  1027 + return patientSyncMysqlFacade.getBabyHealthList1(page,limit,hospitalId,streetId,dateTime);
1023 1028 }
1024 1029  
1025 1030  
1026 1031  
... ... @@ -1038,10 +1043,11 @@
1038 1043 public BaseResponse getPregnantBuildCountList1(HttpServletRequest request,
1039 1044 Integer page, Integer limit,
1040 1045 @RequestParam( required = false) String hospitalId,
  1046 + @RequestParam( required = false) String streetId,
1041 1047 @RequestParam Integer type, // 1 13周以前建档人数
1042 1048 @RequestParam Date dateTime) {
1043 1049 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1044   - return patientSyncMysqlFacade.getPregnantBuildCountList1(page,limit,hospitalId,dateTime,type);
  1050 + return patientSyncMysqlFacade.getPregnantBuildCountList1(page,limit,hospitalId,streetId,dateTime,type);
1045 1051 }
1046 1052  
1047 1053 /**
1048 1054  
... ... @@ -1058,9 +1064,10 @@
1058 1064 public BaseResponse getPregnantSysCountList1(HttpServletRequest request,
1059 1065 Integer page, Integer limit,
1060 1066 @RequestParam( required = false) String hospitalId,
  1067 + @RequestParam( required = false) String streetId,
1061 1068 @RequestParam Date dateTime) {
1062 1069 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1063   - return patientSyncMysqlFacade.getPregnantSysCountList1(page,limit,hospitalId,dateTime);
  1070 + return patientSyncMysqlFacade.getPregnantSysCountList1(page,limit,hospitalId,streetId,dateTime);
1064 1071 }
1065 1072  
1066 1073 /**
1067 1074  
... ... @@ -1077,9 +1084,10 @@
1077 1084 public BaseResponse getPregnantHealthCountList1(HttpServletRequest request,
1078 1085 Integer page, Integer limit,
1079 1086 @RequestParam( required = false) String hospitalId,
  1087 + @RequestParam( required = false) String streetId,
1080 1088 @RequestParam Date dateTime) {
1081 1089 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1082   - return patientSyncMysqlFacade.getPregnantHealthCountList1(page,limit,hospitalId,dateTime);
  1090 + return patientSyncMysqlFacade.getPregnantHealthCountList1(page,limit,hospitalId,streetId,dateTime);
1083 1091 }
1084 1092  
1085 1093  
1086 1094  
... ... @@ -1097,9 +1105,10 @@
1097 1105 public BaseResponse getChFsCountList1(HttpServletRequest request,
1098 1106 Integer page, Integer limit,
1099 1107 @RequestParam( required = false) String hospitalId,
  1108 + @RequestParam( required = false) String streetId,
1100 1109 @RequestParam Date dateTime) {
1101 1110 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1102   - return patientSyncMysqlFacade.getChFsCountList1(page,limit,hospitalId,dateTime);
  1111 + return patientSyncMysqlFacade.getChFsCountList1(page,limit,hospitalId,streetId,dateTime);
1103 1112 }
1104 1113  
1105 1114  
1106 1115  
... ... @@ -1117,9 +1126,10 @@
1117 1126 public BaseResponse getBabyEyeCheckItems1(HttpServletRequest request,
1118 1127 Integer page, Integer limit,
1119 1128 @RequestParam( required = false) String hospitalId,
  1129 + @RequestParam( required = false) String streetId,
1120 1130 @RequestParam Date dateTime) {
1121 1131 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1122   - return patientSyncMysqlFacade.getBabyEyeCheckItems1(page,limit,hospitalId,dateTime);
  1132 + return patientSyncMysqlFacade.getBabyEyeCheckItems1(page,limit,hospitalId,streetId,dateTime);
1123 1133 }
1124 1134  
1125 1135  
1126 1136  
... ... @@ -1135,10 +1145,11 @@
1135 1145 public BaseResponse getBabyZyzdItems1(HttpServletRequest request,
1136 1146 Integer page, Integer limit,
1137 1147 @RequestParam( required = false) String hospitalId,
  1148 + @RequestParam( required = false) String streetId,
1138 1149 @RequestParam( required = true) Integer type, //1 本月中医指导人数 2累计中医指导人数
1139 1150 @RequestParam Date dateTime) {
1140 1151 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1141   - return patientSyncMysqlFacade.getBabyZyzdItems1(page,limit,hospitalId,dateTime,type);
  1152 + return patientSyncMysqlFacade.getBabyZyzdItems1(page,limit,hospitalId,streetId,dateTime,type);
1142 1153 }
1143 1154  
1144 1155 /**
1145 1156  
... ... @@ -1156,10 +1167,11 @@
1156 1167 public BaseResponse getAntexRecords1(HttpServletRequest request,
1157 1168 Integer page, Integer limit,
1158 1169 @RequestParam( required = false) String hospitalId,
  1170 + @RequestParam( required = false) String streetId,
1159 1171 @RequestParam( required = true) Integer type , // 1 月度 2 年度
1160 1172 @RequestParam Date dateTime) {
1161 1173 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1162   - return patientSyncMysqlFacade.getAntexRecords1(page,limit,dateTime,hospitalId,type);
  1174 + return patientSyncMysqlFacade.getAntexRecords1(page,limit,dateTime,hospitalId,streetId,type);
1163 1175 }
1164 1176 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ fb30a9a
... ... @@ -3592,10 +3592,19 @@
3592 3592 * @param streetId 街道id
3593 3593 * @return
3594 3594 */
3595   - private List<Organization> getOrganization(String streetId){
  3595 + private List<String> getOrganization(String streetId){
3596 3596 OrganizationQuery organizationQuery = new OrganizationQuery();
3597 3597 organizationQuery.setStreetId(streetId);
3598   - return organizationService.queryOrganization(organizationQuery);
  3598 + List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
  3599 + List<String> hids = new ArrayList<>();
  3600 + if (CollectionUtils.isNotEmpty(organizations))
  3601 + {
  3602 + for(Organization organization : organizations)
  3603 + {
  3604 + hids.add(organization.getId()+"");
  3605 + }
  3606 + }
  3607 + return hids;
3599 3608 }
3600 3609  
3601 3610 /**
3602 3611  
... ... @@ -4714,10 +4723,10 @@
4714 4723 }
4715 4724  
4716 4725  
4717   - public BaseResponse getBabyZyzdItems1( Integer page, Integer limit, String hospitalId, Date dateTime,Integer type) {
  4726 + public BaseResponse getBabyZyzdItems1( Integer page, Integer limit, String hospitalId,String streetId, Date dateTime,Integer type) {
4718 4727  
4719 4728 BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery();
4720   - if (StringUtils.isNotEmpty(hospitalId))
  4729 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
4721 4730 {
4722 4731 Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4723 4732  
... ... @@ -4726,7 +4735,22 @@
4726 4735 checkModelQuery1.setBirthEnd(start1);
4727 4736 Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1);
4728 4737  
4729   - checkModelQuery1.setHospitalId(hospitalId);
  4738 + if (StringUtils.isNotEmpty(hospitalId))
  4739 + {
  4740 + checkModelQuery1.setHospitalId(hospitalId);
  4741 + }
  4742 + else
  4743 + {
  4744 + List<String> hids = getOrganization(streetId);
  4745 + if (CollectionUtils.isNotEmpty(hids))
  4746 + {
  4747 + checkModelQuery1.setHospitalIds(hids);
  4748 + }
  4749 + else
  4750 + {
  4751 + return new BaseListResponse();
  4752 + }
  4753 + }
4730 4754 checkModelQuery1.setYn(YnEnums.YES.getId());
4731 4755 checkModelQuery1.setBirthStart(end1);
4732 4756 checkModelQuery1.setBirthEnd(start1);
4733 4757  
4734 4758  
4735 4759  
... ... @@ -5562,20 +5586,38 @@
5562 5586 /************************************************/
5563 5587  
5564 5588  
5565   - public BaseResponse getBabyFmList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) {
  5589 +
  5590 + public BaseResponse getBabyFmList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime, Integer type) {
5566 5591 List<Map> results = new ArrayList<>();
5567 5592 //获得区县下的街道
5568 5593 Date startDate=DateUtil.getDateMonthFirst(dateTime);
5569 5594 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
5570 5595 BabyModelQuery babyModelQuery = new BabyModelQuery();
5571   - if (StringUtils.isNotEmpty(hospitalId))
  5596 + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId))
5572 5597 {
5573 5598 babyModelQuery.setExistSource(false);
5574 5599 babyModelQuery.setDataStatus(false);
5575 5600 babyModelQuery.setBuildType(2);
5576 5601 babyModelQuery.setPregnancyOut("0");
5577   - babyModelQuery.setHospitalId(hospitalId);
  5602 + if (StringUtils.isNotEmpty(hospitalId))
  5603 + {
  5604 + babyModelQuery.setHospitalId(hospitalId);
  5605 + }
  5606 + else
  5607 + {
  5608 + List<String> hids = getOrganization(streetId);
  5609 + if (CollectionUtils.isNotEmpty(hids))
  5610 + {
  5611 + babyModelQuery.setHospitalIdList(hids);
  5612 + }
  5613 + else
  5614 + {
  5615 + return new BaseListResponse().setErrorcode(0).setErrormsg("成功")
  5616 + .setData(results).setPageInfo(babyModelQuery.getPageInfo());
  5617 + }
  5618 + }
5578 5619  
  5620 +
5579 5621 babyModelQuery.setPage(page);
5580 5622 babyModelQuery.setLimit(limit);
5581 5623 babyModelQuery.setNeed("Need");
... ... @@ -5633,7 +5675,7 @@
5633 5675 .setData(results).setPageInfo(babyModelQuery.getPageInfo());
5634 5676 }
5635 5677  
5636   - public BaseResponse getBabyFsList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) {
  5678 + public BaseResponse getBabyFsList1(Integer page, Integer limit, String hospitalId, String streetId, Date dateTime, Integer type) {
5637 5679  
5638 5680  
5639 5681 List<Map> results = new ArrayList<>();
5640 5682  
5641 5683  
... ... @@ -5641,11 +5683,31 @@
5641 5683 Date startDate=DateUtil.getDateMonthFirst(dateTime);
5642 5684 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
5643 5685  
5644   - if (StringUtils.isNotEmpty(hospitalId))
  5686 + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId))
5645 5687 {
5646   - Criteria criteria = Criteria.
  5688 + Criteria criteria = null;
  5689 +
  5690 +
  5691 + if (StringUtils.isNotEmpty(hospitalId))
  5692 + {
  5693 + criteria = Criteria.
5647 5694 where("yn").is("1")
5648 5695 .and("hospitalId").is(hospitalId);
  5696 + }
  5697 + else
  5698 + {
  5699 + List<String> hids = getOrganization(streetId);
  5700 + if (CollectionUtils.isNotEmpty(hids))
  5701 + {
  5702 + criteria = Criteria.
  5703 + where("yn").is("1")
  5704 + .and("hospitalId").in(hids);
  5705 + }
  5706 + else
  5707 + {
  5708 + return new BaseListResponse();
  5709 + }
  5710 + }
5649 5711  
5650 5712 if (type == 1)
5651 5713 { //本月访视人数
... ... @@ -5691,7 +5753,7 @@
5691 5753 return new BaseListResponse();
5692 5754 }
5693 5755  
5694   - public BaseResponse getBabyBuildCountList1(Integer page, Integer limit, String hospitalId,
  5756 + public BaseResponse getBabyBuildCountList1(Integer page, Integer limit, String hospitalId,String streetId,
5695 5757 Date dateTime, Integer type,
5696 5758 Integer startMonthAge,Integer endMonthAge) {
5697 5759  
5698 5760  
... ... @@ -5736,12 +5798,27 @@
5736 5798  
5737 5799 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
5738 5800 BabyModelQuery babyQuery = new BabyModelQuery();
5739   - if (StringUtils.isNotEmpty(hospitalId))
  5801 + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId))
5740 5802 {
5741 5803 babyQuery.setExistSource(false);
5742 5804 //babyQuery.setDataStatus(true);//排除自动建档数据
5743 5805 babyQuery.setYn(YnEnums.YES.getId());
5744   - babyQuery.setHospitalId(hospitalId);
  5806 + if (StringUtils.isNotEmpty(hospitalId))
  5807 + {
  5808 + babyQuery.setHospitalId(hospitalId);
  5809 + }
  5810 + else
  5811 + {
  5812 + List<String> hids = getOrganization(streetId);
  5813 + if (CollectionUtils.isNotEmpty(hids))
  5814 + {
  5815 + babyQuery.setHospitalIdList(hids);
  5816 + }
  5817 + else
  5818 + {
  5819 + return new BaseListResponse();
  5820 + }
  5821 + }
5745 5822 Date currentDate1 = DateUtil.formatDate(new Date());
5746 5823 Date start1 = DateUtil.addMonth(currentDate1, 0);
5747 5824 babyQuery.setBirthEnd(start1);
5748 5825  
5749 5826  
... ... @@ -5819,17 +5896,32 @@
5819 5896  
5820 5897 }
5821 5898  
5822   - public BaseResponse getPregnantBuildCountList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) {
  5899 + public BaseResponse getPregnantBuildCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime, Integer type) {
5823 5900 List<Map> results = new ArrayList<>();
5824 5901  
5825 5902  
5826 5903 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
5827 5904 PatientsQuery patientsQuery=new PatientsQuery();
5828   - if (StringUtils.isNotEmpty(hospitalId))
  5905 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
5829 5906 {
5830 5907 //孕13周之前建册的人数
5831 5908 patientsQuery.setYn(YnEnums.YES.getId());
5832   - patientsQuery.setHospitalId(hospitalId);
  5909 + if (StringUtils.isNotEmpty(hospitalId))
  5910 + {
  5911 + patientsQuery.setHospitalId(hospitalId);
  5912 + }
  5913 + else
  5914 + {
  5915 + List<String> hids = getOrganization(streetId);
  5916 + if (CollectionUtils.isNotEmpty(hids))
  5917 + {
  5918 + patientsQuery.setHospitalList(hids);
  5919 + }
  5920 + else
  5921 + {
  5922 + return new BaseListResponse();
  5923 + }
  5924 + }
5833 5925 patientsQuery.setBuildDaysStart(0);
5834 5926 patientsQuery.setBuildDaysEnd(13*7-1);
5835 5927 patientsQuery.setDueStatus(0);
5836 5928  
5837 5929  
5838 5930  
... ... @@ -5874,17 +5966,36 @@
5874 5966 .setData(results).setPageInfo(patientsQuery.getPageInfo());
5875 5967 }
5876 5968  
5877   - public BaseResponse getChFsCountList1(Integer page, Integer limit, String hospitalId, Date dateTime) {
  5969 + public BaseResponse getChFsCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) {
5878 5970 List<Map> results = new ArrayList<>();
5879 5971  
5880 5972 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
5881   - if (StringUtils.isNotEmpty(hospitalId))
  5973 + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId))
5882 5974 {
5883 5975 //传入的时间获取年的第一天
5884 5976 Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
5885   - Criteria criteria = Criteria.
5886   - where("hospitalId").is(hospitalId).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1);
  5977 + Criteria criteria = null;
5887 5978  
  5979 + if (StringUtils.isNotEmpty(hospitalId))
  5980 + {
  5981 + criteria = Criteria.
  5982 + where("hospitalId").is(hospitalId).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1);
  5983 + }
  5984 + else
  5985 + {
  5986 + List<String> hids = getOrganization(streetId);
  5987 + if (CollectionUtils.isNotEmpty(hids))
  5988 + {
  5989 + criteria = Criteria.
  5990 + where("hospitalId").in(hids).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1);
  5991 + }
  5992 + else
  5993 + {
  5994 + return new BaseListResponse();
  5995 + }
  5996 + }
  5997 +
  5998 +
5888 5999 PageResult pageResult = findMongoPage(PostReviewModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit);
5889 6000 List <PostReviewModel> postReviewModels = (List <PostReviewModel>) pageResult.getGrid();
5890 6001 if (CollectionUtils.isNotEmpty(postReviewModels))
5891 6002  
... ... @@ -5920,9 +6031,9 @@
5920 6031  
5921 6032 }
5922 6033  
5923   - public BaseResponse getBabyEyeCheckItems1(Integer page, Integer limit, String hospitalId, Date dateTime) {
  6034 + public BaseResponse getBabyEyeCheckItems1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) {
5924 6035  
5925   - if (StringUtils.isNotEmpty(hospitalId))
  6036 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
5926 6037 {
5927 6038 Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
5928 6039 Date currentDate1 = DateUtil.formatDate(new Date());
... ... @@ -5933,7 +6044,22 @@
5933 6044 BabyModelQuery babyQuery3 = new BabyModelQuery();
5934 6045 babyQuery3.setExistSource(false);
5935 6046 babyQuery3.setYn(YnEnums.YES.getId());
5936   - babyQuery3.setHospitalId(hospitalId);
  6047 + if (StringUtils.isNotEmpty(hospitalId))
  6048 + {
  6049 + babyQuery3.setHospitalId(hospitalId);
  6050 + }
  6051 + else
  6052 + {
  6053 + List<String> hids = getOrganization(streetId);
  6054 + if (CollectionUtils.isNotEmpty(hids))
  6055 + {
  6056 + babyQuery3.setHospitalIdList(hids);
  6057 + }
  6058 + else
  6059 + {
  6060 + return new BaseListResponse();
  6061 + }
  6062 + }
5937 6063 Date start3 = DateUtil.addMonth(currentDate1, 0);
5938 6064 babyQuery3.setBirthEnd(start3);
5939 6065 Date end3 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1);
... ... @@ -5981,7 +6107,7 @@
5981 6107 return RespBuilder.buildSuccess(null);
5982 6108 }
5983 6109  
5984   - public BaseResponse getBabyHealthList1(Integer page, Integer limit, String hospitalId, Date dateTime) {
  6110 + public BaseResponse getBabyHealthList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) {
5985 6111  
5986 6112  
5987 6113 List<Map> results = new ArrayList<>();
5988 6114  
... ... @@ -5989,12 +6115,27 @@
5989 6115  
5990 6116 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
5991 6117 BabyModelQuery babyQuery = new BabyModelQuery();
5992   - if (StringUtils.isNotEmpty(hospitalId))
  6118 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
5993 6119 {
5994 6120  
5995 6121 babyQuery.setExistSource(false);
5996 6122 babyQuery.setYn(YnEnums.YES.getId());
5997   - babyQuery.setHospitalId(hospitalId);
  6123 + if (StringUtils.isNotEmpty(hospitalId))
  6124 + {
  6125 + babyQuery.setHospitalId(hospitalId);
  6126 + }
  6127 + else
  6128 + {
  6129 + List<String> hids = getOrganization(streetId);
  6130 + if (CollectionUtils.isNotEmpty(hids))
  6131 + {
  6132 + babyQuery.setHospitalIdList(hids);
  6133 + }
  6134 + else
  6135 + {
  6136 + return new BaseListResponse();
  6137 + }
  6138 + }
5998 6139  
5999 6140 Date currentDate1 = DateUtil.formatDate(new Date());
6000 6141 Date start1 = DateUtil.addMonth(currentDate1, 0);
6001 6142  
6002 6143  
... ... @@ -6036,19 +6177,34 @@
6036 6177 .setData(results).setPageInfo(babyQuery.getPageInfo());
6037 6178 }
6038 6179  
6039   - public BaseResponse getBabySystemCountList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) {
  6180 + public BaseResponse getBabySystemCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime, Integer type) {
6040 6181  
6041 6182 List<Map> results = new ArrayList<>();
6042 6183  
6043 6184  
6044 6185 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
6045 6186 BabyModelQuery babyQuery = new BabyModelQuery();
6046   - if (StringUtils.isNotEmpty(hospitalId))
  6187 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
6047 6188 {
6048 6189 // babyQuery.setDataStatus(true);//排除自动建档数据
6049 6190 babyQuery.setExistSource(false);
6050 6191 babyQuery.setYn(YnEnums.YES.getId());
6051   - babyQuery.setHospitalId(hospitalId);
  6192 + if (StringUtils.isNotEmpty(hospitalId))
  6193 + {
  6194 + babyQuery.setHospitalId(hospitalId);
  6195 + }
  6196 + else
  6197 + {
  6198 + List<String> hids = getOrganization(streetId);
  6199 + if (CollectionUtils.isNotEmpty(hids))
  6200 + {
  6201 + babyQuery.setHospitalIdList(hids);
  6202 + }
  6203 + else
  6204 + {
  6205 + return new BaseListResponse();
  6206 + }
  6207 + }
6052 6208 Date currentDate1 = DateUtil.formatDate(new Date());
6053 6209 Date start1 = DateUtil.addMonth(currentDate1, 0);
6054 6210 babyQuery.setBirthEnd(start1);
6055 6211  
6056 6212  
... ... @@ -6095,16 +6251,31 @@
6095 6251 .setData(results).setPageInfo(babyQuery.getPageInfo());
6096 6252 }
6097 6253  
6098   - public BaseResponse getPregnantHealthCountList1(Integer page, Integer limit, String hospitalId,
  6254 + public BaseResponse getPregnantHealthCountList1(Integer page, Integer limit, String hospitalId,String streetId,
6099 6255 Date dateTime) {
6100 6256  
6101 6257 List<Map> results = new ArrayList<>();
6102 6258  
6103 6259 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
6104 6260 PatientsQuery patientsQuery=new PatientsQuery();
6105   - if (StringUtils.isNotEmpty(hospitalId))
  6261 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
6106 6262 {
6107   - patientsQuery.setHospitalId(hospitalId);
  6263 + if (StringUtils.isNotEmpty(hospitalId))
  6264 + {
  6265 + patientsQuery.setHospitalId(hospitalId);
  6266 + }
  6267 + else
  6268 + {
  6269 + List<String> hids = getOrganization(streetId);
  6270 + if (CollectionUtils.isNotEmpty(hids))
  6271 + {
  6272 + patientsQuery.setHospitalList(hids);
  6273 + }
  6274 + else
  6275 + {
  6276 + return new BaseListResponse();
  6277 + }
  6278 + }
6108 6279 patientsQuery.setBuildDaysStart(0);
6109 6280 patientsQuery.setBuildDaysEnd(1000);
6110 6281 patientsQuery.setDueStatus(0);
6111 6282  
6112 6283  
... ... @@ -6159,16 +6330,31 @@
6159 6330 .setData(results).setPageInfo(patientsQuery.getPageInfo());
6160 6331 }
6161 6332  
6162   - public BaseResponse getPregnantSysCountList1(Integer page, Integer limit, String hospitalId,
  6333 + public BaseResponse getPregnantSysCountList1(Integer page, Integer limit, String hospitalId,String streetId,
6163 6334 Date dateTime) {
6164 6335 List<Map> results = new ArrayList<>();
6165 6336  
6166 6337  
6167 6338 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
6168 6339 PatientsQuery patientsQuery=new PatientsQuery();
6169   - if (StringUtils.isNotEmpty(hospitalId))
  6340 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
6170 6341 {
6171   - patientsQuery.setHospitalId(hospitalId);
  6342 + if (StringUtils.isNotEmpty(hospitalId))
  6343 + {
  6344 + patientsQuery.setHospitalId(hospitalId);
  6345 + }
  6346 + else
  6347 + {
  6348 + List<String> hids = getOrganization(streetId);
  6349 + if (CollectionUtils.isNotEmpty(hids))
  6350 + {
  6351 + patientsQuery.setHospitalList(hids);
  6352 + }
  6353 + else
  6354 + {
  6355 + return new BaseListResponse();
  6356 + }
  6357 + }
6172 6358 Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
6173 6359 patientsQuery.setBookbuildingDateStart(startDateFirst);
6174 6360 patientsQuery.setBookbuildingDateEnd(endDate);
6175 6361  
6176 6362  
... ... @@ -6215,19 +6401,34 @@
6215 6401 }
6216 6402  
6217 6403 public BaseResponse getAntexRecords1(Integer page, Integer limit,
6218   - Date dateTime, String hospitalId,Integer type) {
  6404 + Date dateTime, String hospitalId,String streetId,Integer type) {
6219 6405 List<AntExManagerResult> results = new ArrayList<>();
6220 6406  
6221 6407 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
6222 6408 Date startDate=DateUtil.getDateMonthFirst(dateTime);
6223 6409 Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
6224 6410 AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
6225   - if (StringUtils.isNotEmpty(hospitalId))
  6411 + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId))
6226 6412 {
6227 6413 antExRecordQuery.setPage(page);
6228 6414 antExRecordQuery.setLimit(limit);
6229 6415 antExRecordQuery.setNeed("true");
6230   - antExRecordQuery.setHospitalId(hospitalId);
  6416 + if (StringUtils.isNotEmpty(hospitalId))
  6417 + {
  6418 + antExRecordQuery.setHospitalId(hospitalId);
  6419 + }
  6420 + else
  6421 + {
  6422 + List<String> hids = getOrganization(streetId);
  6423 + if (CollectionUtils.isNotEmpty(hids))
  6424 + {
  6425 + antExRecordQuery.setHospitalList(hids);
  6426 + }
  6427 + else
  6428 + {
  6429 + return new BaseListResponse();
  6430 + }
  6431 + }
6231 6432  
6232 6433 if (type == 1)
6233 6434 {