From 783de6779d1818619cbe3a7e371b7504a6c71cb0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 11 Jan 2019 14:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E4=BD=93=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/PatientWeight.java | 9 ------- .../web/controller/PatientWeightController.java | 4 +-- .../operate/web/service/PatientWeightService.java | 2 +- .../web/service/impl/PatientWeightServiceImpl.java | 31 ++++++++++++++++++++-- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java index 7c84b02..49f2985 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java @@ -123,8 +123,6 @@ public class PatientWeight extends BaseModel { private boolean isShow; - //异常次数 - private Integer exceptionCount; //0 未推送 1已经推送 private Integer exceptionSend; @@ -148,13 +146,6 @@ public class PatientWeight extends BaseModel { this.sevenSend = sevenSend; } - public Integer getExceptionCount() { - return exceptionCount; - } - - public void setExceptionCount(Integer exceptionCount) { - this.exceptionCount = exceptionCount; - } public boolean isShow() { return isShow; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index 8bb5594..9b2c317 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -243,7 +243,7 @@ public class PatientWeightController extends BaseController { */ @ResponseBody @RequestMapping(value = "/getWeights/{doctorId}/{type}/{status}", method = RequestMethod.GET) - public BaseResponse getWeights(@PathVariable String doctorId,@PathVariable Integer type,@PathVariable Integer status) { - return patientWeightService.getWeights(doctorId,type,status); + public BaseResponse getWeights(@PathVariable String doctorId,@PathVariable Integer type,@PathVariable Integer status,@RequestParam(required = false) String keyword) { + return patientWeightService.getWeights(doctorId,type,status,keyword); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index 2b6e83c..1a21dbb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -45,5 +45,5 @@ public interface PatientWeightService extends IBaseService { BaseResponse notify(List patientIds,Integer type); - BaseResponse getWeights(String doctorId,Integer type,Integer status); + BaseResponse getWeights(String doctorId,Integer type,Integer status,String keyword); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 3d2b86a..7f5c31c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -25,6 +25,7 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; +import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.SmsConfigQuery; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -1857,14 +1858,40 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse getWeights(String doctorId,Integer type,Integer status) { + public BaseResponse getWeights(String doctorId,Integer type,Integer status,String keyword) { + List datas = new ArrayList<>(); + List pids = new ArrayList<>(); + if (StringUtils.isNotEmpty(keyword)) + { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setQueryNo(keyword); + patientsQuery.setType(1); + List pats = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(pats)) + { + for (Patients pat : pats) + { + pids.add(pat.getId()); + } + } + else + { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); + } + } + PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setSerDoct(doctorId); patientQuery.setSerType(PatientSerEnums.SerTypeEnums.tz.getId()); patientQuery.setSerStatus(1); + if (CollectionUtils.isNotEmpty(pids)) + { + patientQuery.setParentIds((String[]) pids.toArray(new String[pids.size()])); + } List list = patientServiceService.queryPatientService(patientQuery); List patientIds = new ArrayList<>(); - List datas = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(list)) { for (PatientService ps : list) -- 1.8.3.1