Commit 95bdcb479b1af4c60b1bb7c3420b6ab92ace7110
1 parent
718e92397c
Exists in
master
and in
6 other branches
修改打印复诊随访表
Showing 4 changed files with 110 additions and 61 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
95bdcb4
| ... | ... | @@ -58,6 +58,7 @@ |
| 58 | 58 | |
| 59 | 59 | /** |
| 60 | 60 | * 产妇管理查询接口 |
| 61 | + * | |
| 61 | 62 | * @param managerRequest |
| 62 | 63 | * @return |
| 63 | 64 | */ |
| ... | ... | @@ -99,6 +100,7 @@ |
| 99 | 100 | |
| 100 | 101 | /** |
| 101 | 102 | * 查询所有包括孕妇和产妇 |
| 103 | + * | |
| 102 | 104 | * @param patientsQueryRequest |
| 103 | 105 | * @param request |
| 104 | 106 | * @return |
| ... | ... | @@ -106,7 +108,7 @@ |
| 106 | 108 | @RequestMapping(value = "/allPats", method = RequestMethod.GET) |
| 107 | 109 | @ResponseBody |
| 108 | 110 | @TokenRequired |
| 109 | - public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { | |
| 111 | + public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 110 | 112 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 111 | 113 | return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), "true", Boolean.FALSE); |
| 112 | 114 | } |
| 113 | 115 | |
| 114 | 116 | |
| ... | ... | @@ -120,13 +122,14 @@ |
| 120 | 122 | @RequestMapping(value = "/hPuer", method = RequestMethod.GET) |
| 121 | 123 | @ResponseBody |
| 122 | 124 | @TokenRequired |
| 123 | - public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { | |
| 125 | + public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 124 | 126 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 125 | 127 | BaseResponse baseResponse = patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true", Boolean.FALSE); |
| 126 | 128 | return baseResponse; |
| 127 | 129 | } |
| 130 | + | |
| 128 | 131 | /** |
| 129 | - *全部孕妇管理 | |
| 132 | + * 全部孕妇管理 | |
| 130 | 133 | * |
| 131 | 134 | * @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象) |
| 132 | 135 | * @return 返回结果 |
| 133 | 136 | |
| 134 | 137 | |
| 135 | 138 | |
| 136 | 139 | |
| 137 | 140 | |
| 138 | 141 | |
| 139 | 142 | |
| 140 | 143 | |
| 141 | 144 | |
| 142 | 145 | |
| 143 | 146 | |
| 144 | 147 | |
| 145 | 148 | |
| 146 | 149 | |
| 147 | 150 | |
| 148 | 151 | |
| ... | ... | @@ -134,63 +137,68 @@ |
| 134 | 137 | @RequestMapping(value = "/aPuer", method = RequestMethod.GET) |
| 135 | 138 | @ResponseBody |
| 136 | 139 | @TokenRequired |
| 137 | - public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { | |
| 140 | + public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 138 | 141 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 139 | - return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.FALSE); | |
| 142 | + return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.FALSE); | |
| 140 | 143 | } |
| 141 | 144 | |
| 142 | 145 | |
| 143 | 146 | /** |
| 144 | 147 | * 导出孕产妇数据 |
| 148 | + * | |
| 145 | 149 | * @param patientsQueryRequest |
| 146 | 150 | * @param request |
| 147 | 151 | * @return |
| 148 | 152 | */ |
| 149 | 153 | @RequestMapping(value = "/exportData", method = RequestMethod.GET) |
| 150 | 154 | @TokenRequired |
| 151 | - public void exportAllPuer(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) { | |
| 155 | + public void exportAllPuer(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request, HttpServletResponse response) { | |
| 152 | 156 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 153 | - patientFacade.exportAllPuer(patientsQueryRequest,loginState.getId(),response); | |
| 157 | + patientFacade.exportAllPuer(patientsQueryRequest, loginState.getId(), response); | |
| 154 | 158 | } |
| 159 | + | |
| 155 | 160 | /** |
| 156 | 161 | * 诸城重点孕妇登记表导出 |
| 162 | + * | |
| 157 | 163 | * @param request |
| 158 | 164 | * @return |
| 159 | 165 | */ |
| 160 | 166 | @RequestMapping(value = "/zcKeyPregnantWomenExcel", method = RequestMethod.GET) |
| 161 | 167 | @TokenRequired |
| 162 | - public void zcKeyPregnantWomenExcel(@RequestParam(value = "ids",required = false) String ids, | |
| 163 | - HttpServletRequest request,HttpServletResponse response) { | |
| 168 | + public void zcKeyPregnantWomenExcel(@RequestParam(value = "ids", required = false) String ids, | |
| 169 | + HttpServletRequest request, HttpServletResponse response) { | |
| 164 | 170 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 165 | - patientFacade.zcKeyPregnantWomenExcel(ids,response,loginState.getId()); | |
| 171 | + patientFacade.zcKeyPregnantWomenExcel(ids, response, loginState.getId()); | |
| 166 | 172 | } |
| 173 | + | |
| 167 | 174 | /** |
| 168 | 175 | * 导出孕产妇健康管理登记表(唐山滦县) |
| 176 | + * | |
| 169 | 177 | * @param patientsQueryRequest |
| 170 | 178 | * @param request |
| 171 | 179 | * @return |
| 172 | 180 | */ |
| 173 | 181 | @RequestMapping(value = "/exportTsLxData", method = RequestMethod.GET) |
| 174 | 182 | @TokenRequired |
| 175 | - public void exportTsLxData(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) { | |
| 183 | + public void exportTsLxData(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request, HttpServletResponse response) { | |
| 176 | 184 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 177 | - patientFacade.tsLxExport(patientsQueryRequest,loginState.getId(),response); | |
| 185 | + patientFacade.tsLxExport(patientsQueryRequest, loginState.getId(), response); | |
| 178 | 186 | } |
| 179 | 187 | |
| 180 | 188 | |
| 181 | - | |
| 182 | 189 | /** |
| 183 | 190 | * 区县产妇统计 |
| 191 | + * | |
| 184 | 192 | * @param patientsQueryRequest |
| 185 | 193 | * @param request |
| 186 | 194 | * @return |
| 187 | 195 | */ |
| 188 | 196 | @RequestMapping(value = "/exportAllPuerpera", method = RequestMethod.GET) |
| 189 | 197 | @TokenRequired |
| 190 | - public void exportAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) { | |
| 198 | + public void exportAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request, HttpServletResponse response) { | |
| 191 | 199 | patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); |
| 192 | 200 | patientsQueryRequest.setNotEnable("2"); |
| 193 | - patientFacade.exportAllPuer(patientsQueryRequest,0,response); | |
| 201 | + patientFacade.exportAllPuer(patientsQueryRequest, 0, response); | |
| 194 | 202 | } |
| 195 | 203 | |
| 196 | 204 | |
| 197 | 205 | |
| 198 | 206 | |
| 199 | 207 | |
| 200 | 208 | |
| ... | ... | @@ -202,18 +210,19 @@ |
| 202 | 210 | @RequestMapping(value = "/apatients", method = RequestMethod.GET) |
| 203 | 211 | @ResponseBody |
| 204 | 212 | @TokenRequired |
| 205 | - public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ | |
| 213 | + public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 206 | 214 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 207 | - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.FALSE); | |
| 215 | + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.FALSE); | |
| 208 | 216 | } |
| 209 | 217 | |
| 218 | + | |
| 210 | 219 | @RequestMapping(value = "/apatients/enums", method = RequestMethod.GET) |
| 211 | 220 | @ResponseBody |
| 212 | - public BaseResponse getEnums(){ | |
| 221 | + public BaseResponse getEnums() { | |
| 213 | 222 | Map<String, Object> map = new HashMap<>(); |
| 214 | 223 | map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID)); |
| 215 | 224 | List list = new ArrayList(); |
| 216 | - for(int i=5;i<=100;i=i+5){ | |
| 225 | + for (int i = 5; i <= 100; i = i + 5) { | |
| 217 | 226 | list.add(i); |
| 218 | 227 | } |
| 219 | 228 | |
| 220 | 229 | |
| 221 | 230 | |
| ... | ... | @@ -241,19 +250,16 @@ |
| 241 | 250 | |
| 242 | 251 | @RequestMapping(value = "/apatients/rLevel", method = RequestMethod.GET) |
| 243 | 252 | @ResponseBody |
| 244 | - public BaseResponse rLevle(){ | |
| 253 | + public BaseResponse rLevle() { | |
| 245 | 254 | Map<String, Object> map = new HashMap<>(); |
| 246 | 255 | |
| 247 | 256 | List<BasicConfigResult> results = new ArrayList<>(); |
| 248 | 257 | |
| 249 | 258 | List<BasicConfigResult> riskLevelConfig = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID); |
| 250 | - if (CollectionUtils.isNotEmpty(riskLevelConfig)) | |
| 251 | - { | |
| 252 | - for(BasicConfigResult levelConfig : riskLevelConfig) | |
| 253 | - { | |
| 259 | + if (CollectionUtils.isNotEmpty(riskLevelConfig)) { | |
| 260 | + for (BasicConfigResult levelConfig : riskLevelConfig) { | |
| 254 | 261 | //健康 |
| 255 | - if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) | |
| 256 | - { | |
| 262 | + if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) { | |
| 257 | 263 | continue; |
| 258 | 264 | } |
| 259 | 265 | results.add(levelConfig); |
| ... | ... | @@ -272,7 +278,7 @@ |
| 272 | 278 | @RequestMapping(value = "/findp", method = RequestMethod.GET) |
| 273 | 279 | @ResponseBody |
| 274 | 280 | @TokenRequired |
| 275 | - public BaseResponse getPatent(@Valid PatientQueryRequest request,HttpServletRequest request1){ | |
| 281 | + public BaseResponse getPatent(@Valid PatientQueryRequest request, HttpServletRequest request1) { | |
| 276 | 282 | LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); |
| 277 | 283 | return patientFacade.findPatient(request, loginState.getId()); |
| 278 | 284 | } |
| ... | ... | @@ -285,7 +291,7 @@ |
| 285 | 291 | @RequestMapping(value = "/findp2", method = RequestMethod.GET) |
| 286 | 292 | @ResponseBody |
| 287 | 293 | @TokenRequired |
| 288 | - public BaseResponse getPatent2(@Valid PatientQueryRequest request,HttpServletRequest request1){ | |
| 294 | + public BaseResponse getPatent2(@Valid PatientQueryRequest request, HttpServletRequest request1) { | |
| 289 | 295 | LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); |
| 290 | 296 | return patientFacade.findPatient2(request, loginState.getId()); |
| 291 | 297 | } |
| ... | ... | @@ -298,7 +304,7 @@ |
| 298 | 304 | @RequestMapping(value = "/sendPGuildSms", method = RequestMethod.POST) |
| 299 | 305 | @ResponseBody |
| 300 | 306 | @TokenRequired |
| 301 | - public BaseResponse patientGuildSms(@RequestBody @Valid PatientGuideSmsRequest patientGuideSmsRequest,HttpServletRequest request1){ | |
| 307 | + public BaseResponse patientGuildSms(@RequestBody @Valid PatientGuideSmsRequest patientGuideSmsRequest, HttpServletRequest request1) { | |
| 302 | 308 | LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); |
| 303 | 309 | return patientFacade.patientGuildSms(patientGuideSmsRequest, loginState.getId()); |
| 304 | 310 | } |
| 305 | 311 | |
| ... | ... | @@ -312,9 +318,9 @@ |
| 312 | 318 | @RequestMapping(value = "/rhPuer", method = RequestMethod.GET) |
| 313 | 319 | @ResponseBody |
| 314 | 320 | @TokenRequired |
| 315 | - public BaseResponse queryRegionPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { | |
| 321 | + public BaseResponse queryRegionPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 316 | 322 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 317 | - return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true",Boolean.TRUE); | |
| 323 | + return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true", Boolean.TRUE); | |
| 318 | 324 | } |
| 319 | 325 | |
| 320 | 326 | /** |
| ... | ... | @@ -325,7 +331,7 @@ |
| 325 | 331 | @RequestMapping(value = "/rapatients", method = RequestMethod.GET) |
| 326 | 332 | @ResponseBody |
| 327 | 333 | @TokenRequired |
| 328 | - public BaseResponse queryRegionAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ | |
| 334 | + public BaseResponse queryRegionAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 329 | 335 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 330 | 336 | patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); |
| 331 | 337 | patientsQueryRequest.sethId(null); |
| ... | ... | @@ -343,7 +349,7 @@ |
| 343 | 349 | patientsQueryRequest.setStartAge(null); |
| 344 | 350 | patientsQueryRequest.setEndAge(null); |
| 345 | 351 | |
| 346 | - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.TRUE); | |
| 352 | + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.TRUE); | |
| 347 | 353 | } |
| 348 | 354 | |
| 349 | 355 | /** |
| 350 | 356 | |
| 351 | 357 | |
| ... | ... | @@ -354,15 +360,15 @@ |
| 354 | 360 | @RequestMapping(value = "/allPuerpera", method = RequestMethod.GET) |
| 355 | 361 | @ResponseBody |
| 356 | 362 | @TokenRequired |
| 357 | - public BaseResponse queryPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ | |
| 363 | + public BaseResponse queryPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 358 | 364 | patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); |
| 359 | 365 | patientsQueryRequest.setNotEnable("2"); |
| 360 | - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, 0, "true", Boolean.FALSE); | |
| 366 | + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, 0, "true", Boolean.FALSE); | |
| 361 | 367 | } |
| 362 | 368 | |
| 363 | 369 | |
| 364 | 370 | /** |
| 365 | - *区域全部孕妇管理 | |
| 371 | + * 区域全部孕妇管理 | |
| 366 | 372 | * |
| 367 | 373 | * @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象) |
| 368 | 374 | * @return 返回结果 |
| 369 | 375 | |
| ... | ... | @@ -370,9 +376,9 @@ |
| 370 | 376 | @RequestMapping(value = "/raPuer", method = RequestMethod.GET) |
| 371 | 377 | @ResponseBody |
| 372 | 378 | @TokenRequired |
| 373 | - public BaseResponse queryRegionAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { | |
| 379 | + public BaseResponse queryRegionAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 374 | 380 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 375 | - return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.TRUE); | |
| 381 | + return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.TRUE); | |
| 376 | 382 | } |
| 377 | 383 | |
| 378 | 384 | /** |
| 379 | 385 | |
| ... | ... | @@ -434,10 +440,10 @@ |
| 434 | 440 | header.put("bookbuildingDoctor", "建档医生"); |
| 435 | 441 | |
| 436 | 442 | String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); |
| 437 | - if("1000000114".equals(hospitalId)){ | |
| 443 | + if ("1000000114".equals(hospitalId)) { | |
| 438 | 444 | header.put("sendCareMan", "母子保健手册"); |
| 439 | 445 | header.put("bookbuildingDate", "发放时间"); |
| 440 | - }else{ | |
| 446 | + } else { | |
| 441 | 447 | header.put("bookbuildingDate", "建档时间"); |
| 442 | 448 | } |
| 443 | 449 | httpServletResponse.setContentType("application/force-download"); |
| 444 | 450 | |
| ... | ... | @@ -449,10 +455,9 @@ |
| 449 | 455 | } |
| 450 | 456 | |
| 451 | 457 | /** |
| 452 | - * 母子保健手册导出 | |
| 458 | + * 母子保健手册导出 | |
| 453 | 459 | * |
| 454 | - * @param httpServletRequest | |
| 455 | - // * @param patientManagerRequest | |
| 460 | + * @param httpServletRequest // * @param patientManagerRequest | |
| 456 | 461 | * @param httpServletResponse |
| 457 | 462 | */ |
| 458 | 463 | @TokenRequired |
| ... | ... | @@ -536,7 +541,6 @@ |
| 536 | 541 | response.flushBuffer(); |
| 537 | 542 | |
| 538 | 543 | |
| 539 | - | |
| 540 | 544 | } catch (IOException e) { |
| 541 | 545 | e.printStackTrace(); |
| 542 | 546 | } |
| ... | ... | @@ -638,5 +642,7 @@ |
| 638 | 642 | e.printStackTrace(); |
| 639 | 643 | } |
| 640 | 644 | } |
| 645 | + | |
| 646 | + | |
| 641 | 647 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
View file @
95bdcb4
| ... | ... | @@ -201,13 +201,13 @@ |
| 201 | 201 | @RequestMapping(value = "/printExFuData", method = RequestMethod.GET) |
| 202 | 202 | @ResponseBody |
| 203 | 203 | @TokenRequired |
| 204 | - public BaseResponse printExFuData(@RequestParam("id") String id, HttpServletRequest request) { | |
| 204 | + public BaseResponse printExFuData(@RequestParam("id") String id, HttpServletRequest request, Integer state, String gravida) { | |
| 205 | 205 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 206 | 206 | if (loginState == null) { |
| 207 | 207 | System.out.println("用户未登录!"); |
| 208 | 208 | return new BaseListResponse().setErrormsg("失败").setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS); |
| 209 | 209 | } |
| 210 | - List<Map<String, Object>> mapList = viewFacade.prFuData(id, 5, loginState.getId()); | |
| 210 | + List<Map<String, Object>> mapList = viewFacade.prFuData(id, 5, loginState.getId(), state, gravida); | |
| 211 | 211 | return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(mapList); |
| 212 | 212 | } |
| 213 | 213 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
95bdcb4
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
95bdcb4
| ... | ... | @@ -37,6 +37,7 @@ |
| 37 | 37 | import org.springframework.data.mongodb.core.query.Query; |
| 38 | 38 | import org.springframework.stereotype.Component; |
| 39 | 39 | import org.springframework.web.multipart.MultipartFile; |
| 40 | +import sun.util.resources.cldr.id.CurrencyNames_id; | |
| 40 | 41 | |
| 41 | 42 | import java.io.BufferedReader; |
| 42 | 43 | import java.io.File; |
| 43 | 44 | |
| 44 | 45 | |
| 45 | 46 | |
| 46 | 47 | |
| 47 | 48 | |
| 48 | 49 | |
| 49 | 50 | |
| 50 | 51 | |
| 51 | 52 | |
| ... | ... | @@ -513,35 +514,79 @@ |
| 513 | 514 | * @param num 当前位置 |
| 514 | 515 | * @return |
| 515 | 516 | */ |
| 516 | - public List<Map<String, Object>> prFuData(String id, int num, Integer userId) { | |
| 517 | + public List<Map<String, Object>> prFuData(String id, int num, Integer userId, Integer state, String gravida) { | |
| 517 | 518 | List<Map<String, Object>> mList = new ArrayList<Map<String, Object>>(); |
| 518 | 519 | //Map<String, Object> map = new HashedMap(); |
| 519 | - AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4]; | |
| 520 | + AntenatalExaminationModel[] exData = null; | |
| 521 | + if (state == 0) {//表示没有全部权限 | |
| 522 | + exData = new AntenatalExaminationModel[4]; | |
| 523 | + } else { | |
| 524 | + exData = new AntenatalExaminationModel[15]; | |
| 525 | + } | |
| 526 | + Patients patients = null; | |
| 520 | 527 | AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id); |
| 521 | - Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId()); | |
| 528 | + String riskName = null; | |
| 529 | + boolean flag = false; | |
| 530 | + List<String> parentIdList = new ArrayList<>(); | |
| 531 | + if ("0".equals(gravida)) {//表示全部孕妇处打印 | |
| 532 | + patients = patientsService.findOnePatientById(id); | |
| 533 | + if (patients != null) { | |
| 534 | + Calendar instance = Calendar.getInstance(); | |
| 535 | + instance.setTime(new Date()); | |
| 536 | + instance.add(Calendar.DATE, -294);//只差未分娩的孕妇 | |
| 537 | + instance.set(Calendar.HOUR_OF_DAY, 00); | |
| 538 | + instance.set(Calendar.MINUTE, 00); | |
| 539 | + instance.set(Calendar.SECOND, 00); | |
| 540 | + instance.set(Calendar.MILLISECOND, 000); | |
| 541 | + Date start = instance.getTime(); | |
| 542 | + List<Patients> patientsList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("lastMenses").gte(start)), Patients.class); | |
| 543 | + if (CollectionUtils.isNotEmpty(patientsList)) { | |
| 544 | + for (Patients patients1 : patientsList) { | |
| 545 | + parentIdList.add(patients1.getId()); | |
| 546 | + } | |
| 547 | + flag = true; | |
| 548 | + } | |
| 549 | + AntenatalExaminationModel antenatalExaminationModels = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())), AntenatalExaminationModel.class); | |
| 550 | + riskName = getRisk(antenatalExaminationModels.getRiskFactor(), antenatalExaminationModels.getOtherRisk()); | |
| 551 | + } | |
| 552 | + } else { | |
| 553 | + patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId()); | |
| 554 | + riskName = getRisk(antenatalExaminationModel.getRiskFactor(), antenatalExaminationModel.getOtherRisk()); | |
| 555 | + } | |
| 522 | 556 | String name = patients.getUsername(); |
| 523 | - String riskName = getRisk(antenatalExaminationModel.getRiskFactor(), antenatalExaminationModel.getOtherRisk()); | |
| 557 | + | |
| 524 | 558 | if (StringUtils.isNotEmpty(riskName)) { |
| 525 | 559 | name += "(" + riskName + ")"; |
| 526 | 560 | } |
| 527 | - | |
| 528 | - //map.put("name",name); | |
| 529 | - | |
| 530 | 561 | if (num < 4) { |
| 531 | 562 | exData[num - 1] = antenatalExaminationModel; |
| 532 | 563 | } else {//全部 |
| 533 | - String patientsId = antenatalExaminationModel.getParentId(); | |
| 564 | + | |
| 534 | 565 | AntExQuery antExQuery = new AntExQuery(); |
| 535 | 566 | antExQuery.setYn(YnEnums.YES.getId()); |
| 536 | - antExQuery.setParentId(patientsId); | |
| 567 | + if (flag) { | |
| 568 | + antExQuery.setParentIds(parentIdList); | |
| 569 | + } else { | |
| 570 | + String patientsId = antenatalExaminationModel.getParentId(); | |
| 571 | + antExQuery.setParentId(patientsId); | |
| 572 | + } | |
| 573 | + | |
| 537 | 574 | //复诊 |
| 538 | 575 | List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate")); |
| 576 | + System.out.println(antExQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 577 | + | |
| 539 | 578 | if (list != null && list.size() > 0) { |
| 540 | 579 | for (int i = 0; i < list.size(); i++) { |
| 541 | - if (i >= 4) { | |
| 542 | - break; | |
| 580 | + //返回2-5次 | |
| 581 | + if (state == 0) { | |
| 582 | + if (i >= 4) { | |
| 583 | + break; | |
| 584 | + } | |
| 585 | + exData[i] = list.get(i); | |
| 586 | + } else { | |
| 587 | + //返回全部 | |
| 588 | + exData[i] = list.get(i); | |
| 543 | 589 | } |
| 544 | - exData[i] = list.get(i); | |
| 545 | 590 | } |
| 546 | 591 | } else { |
| 547 | 592 | return mList; |
| 548 | 593 | |
| 549 | 594 | |
| ... | ... | @@ -624,13 +669,10 @@ |
| 624 | 669 | } |
| 625 | 670 | if (StringUtils.isNotEmpty(data.getUrineProtein())) { |
| 626 | 671 | map.put("urineProtein", data.getUrineProtein()); |
| 627 | - | |
| 628 | 672 | } |
| 629 | 673 | if (StringUtils.isNotEmpty(data.getbChao())) { |
| 630 | 674 | map.put("bChao", data.getbChao()); |
| 631 | - | |
| 632 | 675 | } |
| 633 | - | |
| 634 | 676 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 635 | 677 | ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); |
| 636 | 678 | referralApplyOrderQuery.setParentId(data.getParentId()); |