From 9b270e12663006fc6058e9e07eeaca008094f673 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 22 Nov 2017 16:17:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientServiceFacade.java | 3 +- .../web/worker/BuildSerToPatientSerWorker.java | 37 ++++++++++++++-------- 2 files changed, 25 insertions(+), 15 deletions(-) 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 b4aed68..76b1afd 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 @@ -535,12 +535,11 @@ public class PatientServiceFacade { List patientServices = patientServiceService.queryPatientService(patientQuery); - Map params = new HashMap<>(); List jsonArray = new ArrayList<>(); for (PatientService ps : patientServices) { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", ps.getId()); - jsonObject.put("orderId", ps.getOrderId()); + jsonObject.put("orderId", ps.getOrderId()==null?"":ps.getOrderId()); jsonObject.put("parentid", ps.getParentid()); jsonObject.put("pid", ps.getPid()); jsonObject.put("serType", ps.getSerType()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java index a2ce0ac..23262aa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java @@ -49,7 +49,7 @@ public class BuildSerToPatientSerWorker implements Callable { patientsQuery.setBuildTypeNot(1); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setNeed("need"); - patientsQuery.setType(3); + patientsQuery.setType(1); List patients = patientsService.queryPatient(patientsQuery); for (Patients pt : patients) { System.out.println("正在处理："+pt.getId()); @@ -65,21 +65,32 @@ public class BuildSerToPatientSerWorker implements Callable { pser.setHospitalId(pt.getHospitalId()); //服务类型 - if(pt.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId() ){ + if(pt.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId() ){//标准服务 pser.setSerType(PatientSerEnums.SerTypeEnums.bzfw.getId()); - }else if(pt.getServiceType() ==ServiceTypeEnums.ADD_SERVICE.getId()){ + //默认开通状态 + if(pt.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId()){ + pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); + }else if(pt.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId()){ + pser.setSerStatus(PatientSerEnums.SerStatusEnums.td.getId()); + }else if(pt.getServiceStatus() == ServiceStatusEnums.STANDARD_OVERDUE.getId()){ + pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); + } + + }else if(pt.getServiceType() ==ServiceTypeEnums.ADD_SERVICE.getId()){//增值服务 pser.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); + //默认开通状态 + if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId()){ + pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); + }else if(pt.getServiceStatus() == ServiceStatusEnums.UNSUBSCRIBE.getId()){ + pser.setSerStatus(PatientSerEnums.SerStatusEnums.td.getId()); + }else if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OVERDUE.getId()){ + pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); + }else if(pt.getServiceStatus() == ServiceStatusEnums.SUSPEND.getId()){ + pser.setSerStatus(PatientSerEnums.SerStatusEnums.zt.getId()); + } } - //默认开通状态 - if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId()){ - pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); - }else if(pt.getServiceStatus() == ServiceStatusEnums.UNSUBSCRIBE.getId()){ - pser.setSerStatus(PatientSerEnums.SerStatusEnums.td.getId()); - }else if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OVERDUE.getId()){ - pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); - }else if(pt.getServiceStatus() == ServiceStatusEnums.SUSPEND.getId()){ - pser.setSerStatus(PatientSerEnums.SerStatusEnums.zt.getId()); - } + + //默认已经领取 pser.setStatus(2); //默认待同步 -- 1.8.3.1