diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java index f2917f7..07984a0 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java @@ -14,11 +14,11 @@ public class PatientService { */ private String pid; /** - * 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) + * 服务类型(1-孕期精准医疗、2-体重管理、3-血糖管理、4-血压管理、5-专家咨询、6-标准服务) */ private Integer serType; /** - * 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) + * 服务类型(1-孕期精准医疗、2-体重管理、3-血糖管理、4-血压管理、5-专家咨询、6-标准服务) */ private String serTypes; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index 2f3f86c..bd5bc8a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -86,7 +86,7 @@ public class SyncDataController extends BaseController { @RequestParam(value = "method", required = true) String method ) { try { - System.out.println("数据同步开始:action:" + action + ",synForm:" + synForm); + System.out.println("数据同步开始:action:" + action + ",method:" + method+",synForm:"+synForm); WebApplicationContext webApplicationContext = ContextLoader.getCurrentWebApplicationContext(); //返回值 BaseResponse baseResponse = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index ba92423..28a7db6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -455,53 +455,9 @@ public class PatientServiceFacade { return baseResponse; } - /** - * 小程序调用:获取已经领取设备,但是还未同步的数据 - */ - public BaseResponse getAlreaRece() { - PatientServiceQuery patientQuery = new PatientServiceQuery(); - //待同步默认不需要同步、1-待同步、2-已同步 - patientQuery.setSynStatus(1); - patientQuery.setSql("and order_id is not null"); - List patientServices = patientServiceService.queryPatientService(patientQuery); - List orders = new ArrayList<>(); - for (PatientService ps : patientServices) { - orders.add(ps.getOrderId()); - } - - BaseResponse baseResponse = new BaseResponse(); - baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - baseResponse.setObject(orders); - baseResponse.setErrormsg("成功"); - return baseResponse; - } /** - * 小程序调用:修改领取设备同步状态为已同步 - * - * @param orderIds 订单号集合 - * @return - */ - public BaseResponse receivePatientService(String orderIds) { - PatientServiceQuery patientQuery = new PatientServiceQuery(); - patientQuery.setSql("and order_id in (" + orderIds + ")"); - - List patientServices = patientServiceService.queryPatientService(patientQuery); - if (CollectionUtils.isNotEmpty(patientServices)) { - for (PatientService ps : patientServices) { - ps.setSynStatus(2); - patientServiceService.updatePatientService(ps); - } - } - - BaseResponse baseResponse = new BaseResponse(); - baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - baseResponse.setErrormsg("成功"); - return baseResponse; - } - - /** - * 小程序调用:新增或修改的服务同步到小程序 + * 小程序调用:新增或修改、领取服务同步到小程序 * * @return */ @@ -509,7 +465,6 @@ public class PatientServiceFacade { BaseResponse baseResponse = new BaseResponse(); try { PatientServiceQuery patientQuery = new PatientServiceQuery(); - patientQuery.setSql("and order_id is null"); patientQuery.setSynStatus(1); List patientServices = patientServiceService.queryPatientService(patientQuery); Map params = new HashMap<>(); @@ -520,14 +475,18 @@ public class PatientServiceFacade { jsonObject.put("parentid", ps.getParentid()); jsonObject.put("pid", ps.getPid()); jsonObject.put("serType", ps.getSerType()); + //指定医生 jsonObject.put("serDoct", ps.getSerDoct()); + //服务状态 jsonObject.put("serStatus", ps.getSerStatus()); jsonObject.put("hospitalId", ps.getHospitalId()); + //领取状态 + jsonObject.put("status",ps.getStatus()); jsonObject.put("createDate", DateUtil.getyyyy_MM_dd_hms(ps.getCreateDate())); jsonArray.add(jsonObject); } params.put("data", jsonArray.toString()); - + baseResponse.setObject(params); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); baseResponse.setErrormsg("成功"); return baseResponse; @@ -539,7 +498,7 @@ public class PatientServiceFacade { } /** - * 小程序调用:修改新增、修改服务同步状态为已同步 + * 小程序调用:修改新增、修改、领取服务同步状态为已同步 * * @param ids id集合 */