liquanyu / regional-platform

Download as
Browse Code »

Commit d1e15f9d933a03379515290eb1ab8e821da3d414

Authored by jiangjiazhi
1 parent d06e3cc32b
Exists in master and in 3 other branches 0116, dev, nobuildprocess

修改新电子病历

Showing 1 changed file with 11 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ d1e15f9
... ... @@ -278,7 +278,8 @@
278 278 buildType.add(0);
279 279 buildType.add(2);
280 280 patientsQuery.setBuildTypeList(buildType);
281   - patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
  281 + String hospital=autoMatchFacade.getHospitalId(userId);
  282 + patientsQuery.setHospitalId(hospital);
282 283 patientsQuery.setNeed(needPage);
283 284 //查询符合条件的孕妇
284 285 List<Patients> patientses = patientsService.queryPatient1(patientsQuery, "modified");
285 286  
286 287  
... ... @@ -286,13 +287,13 @@
286 287 if (CollectionUtils.isNotEmpty(patientses)) {
287 288 //如果是查高危孕妇
288 289 if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) {
289   - data = convertToHighRisk(patientses, userId);
  290 + data = convertToHighRisk(patientses, userId,hospital);
290 291 } else if (type == 1) {
291 292 //处理全部孕妇的情况
292   - data = convertToQuanPatient(patientses, userId);
  293 + data = convertToQuanPatient(patientses, userId,hospital);
293 294 //处理全部产妇
294 295 } else if (type == 3) {
295   - data = convertToQuanCPatient(patientses, userId);
  296 + data = convertToQuanCPatient(patientses, userId,hospital);
296 297 }
297 298 }
298 299 return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
299 300  
... ... @@ -326,10 +327,10 @@
326 327 * @param patientses 符合条件的产妇
327 328 * @return
328 329 */
329   - private List convertToQuanCPatient(List<Patients> patientses, Integer userId) {
  330 + private List convertToQuanCPatient(List<Patients> patientses, Integer userId,String hospital) {
330 331 List data = new ArrayList<>();
331 332 AntExQuery antExQuery = new AntExQuery();
332   - String hospital = autoMatchFacade.getHospitalId(userId);
  333 +// String hospital = autoMatchFacade.getHospitalId(userId);
333 334 for (Patients patients : patientses) {
334 335 QuanChanResult chanResult = new QuanChanResult();
335 336 chanResult.convertToResult(patients);
336 337  
... ... @@ -403,11 +404,11 @@
403 404 }
404 405  
405 406  
406   - private List convertToQuanPatient(List<Patients> patientses, Integer userId) {
  407 + private List convertToQuanPatient(List<Patients> patientses, Integer userId,String hospital) {
407 408 AntExChuQuery antExChuQuery = new AntExChuQuery();
408 409 AntExQuery antExQuery = new AntExQuery();
409 410 List data = new ArrayList<>();
410   - String hospital = autoMatchFacade.getHospitalId(userId);
  411 +// String hospital = autoMatchFacade.getHospitalId(userId);
411 412 for (Patients patients : patientses) {
412 413 QuanPatientsResult quanPatientsResult = new QuanPatientsResult();
413 414 quanPatientsResult.convertToResult(patients);
414 415  
... ... @@ -501,11 +502,11 @@
501 502 * @param patientses
502 503 * @return
503 504 */
504   - private List convertToHighRisk(List<Patients> patientses, Integer userId) {
  505 + private List convertToHighRisk(List<Patients> patientses, Integer userId,String hospital) {
505 506 AntExChuQuery antExChuQuery = new AntExChuQuery();
506 507 AntExQuery antExQuery = new AntExQuery();
507 508 List data = new ArrayList<>();
508   - String hospital = autoMatchFacade.getHospitalId(userId);
  509 +// String hospital = autoMatchFacade.getHospitalId(userId);
509 510 for (Patients patients : patientses) {
510 511 RiskPatientsResult riskPatientsResult = new RiskPatientsResult();
511 512 riskPatientsResult.convertToResult(patients);