Commit 9b270e12663006fc6058e9e07eeaca008094f673
1 parent
d92b05262b
Exists in
master
and in
6 other branches
服务同步
Showing 2 changed files with 25 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
9b270e1
| ... | ... | @@ -535,12 +535,11 @@ |
| 535 | 535 | |
| 536 | 536 | List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery); |
| 537 | 537 | |
| 538 | - Map<String, String> params = new HashMap<>(); | |
| 539 | 538 | List<JSONObject> jsonArray = new ArrayList<>(); |
| 540 | 539 | for (PatientService ps : patientServices) { |
| 541 | 540 | JSONObject jsonObject = new JSONObject(); |
| 542 | 541 | jsonObject.put("id", ps.getId()); |
| 543 | - jsonObject.put("orderId", ps.getOrderId()); | |
| 542 | + jsonObject.put("orderId", ps.getOrderId()==null?"":ps.getOrderId()); | |
| 544 | 543 | jsonObject.put("parentid", ps.getParentid()); |
| 545 | 544 | jsonObject.put("pid", ps.getPid()); |
| 546 | 545 | jsonObject.put("serType", ps.getSerType()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java
View file @
9b270e1
| ... | ... | @@ -49,7 +49,7 @@ |
| 49 | 49 | patientsQuery.setBuildTypeNot(1); |
| 50 | 50 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 51 | 51 | patientsQuery.setNeed("need"); |
| 52 | - patientsQuery.setType(3); | |
| 52 | + patientsQuery.setType(1); | |
| 53 | 53 | List<Patients> patients = patientsService.queryPatient(patientsQuery); |
| 54 | 54 | for (Patients pt : patients) { |
| 55 | 55 | System.out.println("正在处理："+pt.getId()); |
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | |
| ... | ... | @@ -65,21 +65,32 @@ |
| 65 | 65 | pser.setHospitalId(pt.getHospitalId()); |
| 66 | 66 | |
| 67 | 67 | //服务类型 |
| 68 | - if(pt.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId() ){ | |
| 68 | + if(pt.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId() ){//标准服务 | |
| 69 | 69 | pser.setSerType(PatientSerEnums.SerTypeEnums.bzfw.getId()); |
| 70 | - }else if(pt.getServiceType() ==ServiceTypeEnums.ADD_SERVICE.getId()){ | |
| 70 | + //默认开通状态 | |
| 71 | + if(pt.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId()){ | |
| 72 | + pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); | |
| 73 | + }else if(pt.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId()){ | |
| 74 | + pser.setSerStatus(PatientSerEnums.SerStatusEnums.td.getId()); | |
| 75 | + }else if(pt.getServiceStatus() == ServiceStatusEnums.STANDARD_OVERDUE.getId()){ | |
| 76 | + pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); | |
| 77 | + } | |
| 78 | + | |
| 79 | + }else if(pt.getServiceType() ==ServiceTypeEnums.ADD_SERVICE.getId()){//增值服务 | |
| 71 | 80 | pser.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); |
| 81 | + //默认开通状态 | |
| 82 | + if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId()){ | |
| 83 | + pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); | |
| 84 | + }else if(pt.getServiceStatus() == ServiceStatusEnums.UNSUBSCRIBE.getId()){ | |
| 85 | + pser.setSerStatus(PatientSerEnums.SerStatusEnums.td.getId()); | |
| 86 | + }else if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OVERDUE.getId()){ | |
| 87 | + pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); | |
| 88 | + }else if(pt.getServiceStatus() == ServiceStatusEnums.SUSPEND.getId()){ | |
| 89 | + pser.setSerStatus(PatientSerEnums.SerStatusEnums.zt.getId()); | |
| 90 | + } | |
| 72 | 91 | } |
| 73 | - //默认开通状态 | |
| 74 | - if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId()){ | |
| 75 | - pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); | |
| 76 | - }else if(pt.getServiceStatus() == ServiceStatusEnums.UNSUBSCRIBE.getId()){ | |
| 77 | - pser.setSerStatus(PatientSerEnums.SerStatusEnums.td.getId()); | |
| 78 | - }else if(pt.getServiceStatus() == ServiceStatusEnums.ADD_OVERDUE.getId()){ | |
| 79 | - pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); | |
| 80 | - }else if(pt.getServiceStatus() == ServiceStatusEnums.SUSPEND.getId()){ | |
| 81 | - pser.setSerStatus(PatientSerEnums.SerStatusEnums.zt.getId()); | |
| 82 | - } | |
| 92 | + | |
| 93 | + | |
| 83 | 94 | //默认已经领取 |
| 84 | 95 | pser.setStatus(2); |
| 85 | 96 | //默认待同步 |