Commit 3506c5292368c7fe52d1f3cbe7cf2927c86dcbee
1 parent
26619335c7
Exists in
master
and in
6 other branches
服务同步
Showing 2 changed files with 5 additions and 113 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
3506c52
| ... | ... | @@ -1118,114 +1118,6 @@ |
| 1118 | 1118 | return list; |
| 1119 | 1119 | } |
| 1120 | 1120 | |
| 1121 | - public List<PostpartumFollowResult> postpartumDeliver(PostpartumFollowMakeRequest postpartumFollowMakeRequest) { | |
| 1122 | - List<PostpartumFollowResult> postpartumFollowResults = new ArrayList<>(); | |
| 1123 | - | |
| 1124 | - PatientsQuery patientsQuery = new PatientsQuery(); | |
| 1125 | - | |
| 1126 | - if (StringUtils.isNotEmpty(postpartumFollowMakeRequest.getBirthDate())) { | |
| 1127 | - patientsQuery.setFmDateStart(DateUtil.getSNDate(postpartumFollowMakeRequest.getBirthDate())[0]); | |
| 1128 | - patientsQuery.setFmDateEnd(DateUtil.getSNDate(postpartumFollowMakeRequest.getBirthDate())[1]); | |
| 1129 | - } | |
| 1130 | - patientsQuery.setYn(YnEnums.YES.getId()); | |
| 1131 | - patientsQuery.setIsAutoFm(YnEnums.NO.getId()); | |
| 1132 | - patientsQuery.setType(3); | |
| 1133 | - // 构造医院id集合 | |
| 1134 | - List<String> hospitalList = new ArrayList<>(); | |
| 1135 | - if (StringUtils.isEmpty(postpartumFollowMakeRequest.getIsArea())) { | |
| 1136 | - // 非区域 | |
| 1137 | - hospitalList.add(postpartumFollowMakeRequest.getHospitalId()); | |
| 1138 | - } else { | |
| 1139 | - // 未传入查询条件 | |
| 1140 | - if (StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalProvinceId()) && StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalProvinceId()) && StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalAreaId()) && StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalId())) { | |
| 1141 | - | |
| 1142 | - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); | |
| 1143 | - dataPermissionsModelQuery.setUserId(postpartumFollowMakeRequest.getOperatorId()); | |
| 1144 | - List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); | |
| 1145 | - if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { | |
| 1146 | - Map data = dataPermissionsModelList.get(0).getData(); | |
| 1147 | - for (Object hospitalId : data.keySet()) { | |
| 1148 | - if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) { | |
| 1149 | - hospitalList.add(hospitalId.toString()); | |
| 1150 | - } | |
| 1151 | - } | |
| 1152 | - } | |
| 1153 | - } else { | |
| 1154 | - // 传入了查询条件 | |
| 1155 | - OrganizationQuery organizationQuery = new OrganizationQuery(); | |
| 1156 | - organizationQuery.setProvinceId(postpartumFollowMakeRequest.getHospitalProvinceId()); | |
| 1157 | - organizationQuery.setCityId(postpartumFollowMakeRequest.getHospitalCityId()); | |
| 1158 | - organizationQuery.setAreaId(postpartumFollowMakeRequest.getHospitalAreaId()); | |
| 1159 | - organizationQuery.setYn(YnEnums.YES.getId()); | |
| 1160 | - List<Organization> organizationList = organizationService.queryHospitals(organizationQuery); | |
| 1161 | - if (CollectionUtils.isNotEmpty(organizationList)) { | |
| 1162 | - for (Organization organization : organizationList) { | |
| 1163 | - hospitalList.add(organization.getId().toString()); | |
| 1164 | - } | |
| 1165 | - } | |
| 1166 | - } | |
| 1167 | - } | |
| 1168 | - patientsQuery.setFmHospitalQueryList(hospitalList); | |
| 1169 | - patientsQuery.setLimit(postpartumFollowMakeRequest.getLimit()); | |
| 1170 | - patientsQuery.setPage(postpartumFollowMakeRequest.getPage()); | |
| 1171 | - patientsQuery.setNeed("need"); | |
| 1172 | - patientsQuery.setDesc("fmDate"); | |
| 1173 | - patientsQuery.setSort("fmDate"); | |
| 1174 | - | |
| 1175 | - List<Patients> patientsList = patientsService.queryPatient(patientsQuery); | |
| 1176 | - List<String> parentIdList = new ArrayList<>(); | |
| 1177 | - if (CollectionUtils.isEmpty(patientsList)) { | |
| 1178 | - // 没有查到，直接抛出 | |
| 1179 | - return postpartumFollowResults; | |
| 1180 | - } | |
| 1181 | - Map<String,Patients> patientsMap = new HashMap<>(); | |
| 1182 | - for (Patients patients : patientsList) { | |
| 1183 | - parentIdList.add(patients.getId()); | |
| 1184 | - patientsMap.put(patients.getId(),patients); | |
| 1185 | - } | |
| 1186 | - | |
| 1187 | - | |
| 1188 | - | |
| 1189 | - | |
| 1190 | - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); | |
| 1191 | - matDeliverQuery.setParentIdList(parentIdList); | |
| 1192 | - matDeliverQuery.setYn(YnEnums.YES.getId()); | |
| 1193 | - List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery); | |
| 1194 | - | |
| 1195 | - | |
| 1196 | - for(MaternalDeliverModel deliverModel : maternalDeliverModelList){ | |
| 1197 | - PostpartumFollowResult postpartumFollowResult = new PostpartumFollowResult(); | |
| 1198 | - Patients patients = patientsMap.get(deliverModel.getParentId()); | |
| 1199 | - // 居住地 | |
| 1200 | - postpartumFollowResult.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); | |
| 1201 | - // 电话转换 | |
| 1202 | - postpartumFollowResult.setPhone(patients.getPhone()); | |
| 1203 | - //姓名 | |
| 1204 | - postpartumFollowResult.setName(patients.getUsername()); | |
| 1205 | - // 年龄 | |
| 1206 | - postpartumFollowResult.setAge(DateUtil.getAge(patients.getBirth())); | |
| 1207 | - //机构信息 | |
| 1208 | - Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital())); | |
| 1209 | - // 市 | |
| 1210 | - BasicConfig cityName = basicConfigService.getOneBasicConfigById(organization.getCityId()); | |
| 1211 | - // 区 | |
| 1212 | - BasicConfig areaName = basicConfigService.getOneBasicConfigById(organization.getAreaId()); | |
| 1213 | - if (cityName != null) { | |
| 1214 | - postpartumFollowResult.setHospitalCityName(cityName.getName()); | |
| 1215 | - } | |
| 1216 | - if (areaName != null) { | |
| 1217 | - postpartumFollowResult.setHospitalAreaName(areaName.getName()); | |
| 1218 | - } | |
| 1219 | - //分娩医院 | |
| 1220 | - postpartumFollowResult.setFmHospital(organization.getName()); | |
| 1221 | - | |
| 1222 | - | |
| 1223 | - | |
| 1224 | - } | |
| 1225 | - | |
| 1226 | - return null; | |
| 1227 | - } | |
| 1228 | - | |
| 1229 | 1121 | |
| 1230 | 1122 | public ChildbirthManagerResult childbirthManager(ChildbirthManagerRequest childbirthManagerRequest) { |
| 1231 | 1123 | ChildbirthManagerResult childbirthManagerResult = new ChildbirthManagerResult(); |
pom.xml
View file @
3506c52
| ... | ... | @@ -561,11 +561,11 @@ |
| 561 | 561 | <artifactId>commons-dbutils</artifactId> |
| 562 | 562 | <version>1.6</version> |
| 563 | 563 | </dependency> |
| 564 | - <dependency> | |
| 565 | - <groupId>com.microsoft.sqlserver</groupId> | |
| 566 | - <artifactId>sqljdbc4</artifactId> | |
| 567 | - <version>4.0</version> | |
| 568 | - </dependency> | |
| 564 | + <!--<dependency>--> | |
| 565 | + <!--<groupId>com.microsoft.sqlserver</groupId>--> | |
| 566 | + <!--<artifactId>sqljdbc4</artifactId>--> | |
| 567 | + <!--<version>4.0</version>--> | |
| 568 | + <!--</dependency>--> | |
| 569 | 569 | <dependency> |
| 570 | 570 | <groupId>com.alibaba</groupId> |
| 571 | 571 | <artifactId>fastjson</artifactId> |