From f001808528a34834237a4f91f685e7aaf9a3d456 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 11 Dec 2017 16:24:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9C=8D=E5=8A=A1=E5=BC=80?= =?UTF-8?q?=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientServiceFacade.java | 127 +++++++++++---------- 1 file changed, 65 insertions(+), 62 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 705224e..6c51402 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 @@ -87,9 +87,9 @@ public class PatientServiceFacade { hscQuery.setStatus(1); List hospitalServiceContents = hospitalServiceContentService.queryHospitalServiceContent(hscQuery); - Map hscMap = new HashMap<>(); - for(HospitalServiceContent hsc:hospitalServiceContents){ - hscMap.put(hsc.getId(),hsc); + Map hscMap = new HashMap<>(); + for (HospitalServiceContent hsc : hospitalServiceContents) { + hscMap.put(hsc.getId(), hsc); } HospitalDoctServiceQuery hospitalDoctServiceQuery = new HospitalDoctServiceQuery(); //状态 1--有效 @@ -97,14 +97,14 @@ public class PatientServiceFacade { hospitalDoctServiceQuery.setHospId(hospitalId); List hospitalDoctServiceList = hospitalDoctService.queryHospitalDoctService(hospitalDoctServiceQuery); //给医院服务加入医生的服务价格信息 - for(HospitalDoctService hds:hospitalDoctServiceList){ + for (HospitalDoctService hds : hospitalDoctServiceList) { HospitalServiceContent hsc = hscMap.get(hds.getHospServiceId()); - if(hsc!=null){ + if (hsc != null) { hsc.getDoctIds().add(hds.getDoctId()); } } - map.put("hospSer",hospitalServiceContents); + map.put("hospSer", hospitalServiceContents); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); } @@ -120,9 +120,9 @@ public class PatientServiceFacade { //查询档案信息 Patients patients = patientsService.findOnePatientById(pid); - if(patients!=null){ + if (patients != null) { //如果有数据源id，取主档案id - if(StringUtils.isNotEmpty(patients.getSource())){ + if (StringUtils.isNotEmpty(patients.getSource())) { pid = patients.getSource(); } } @@ -195,21 +195,21 @@ public class PatientServiceFacade { pser.setParentid(ps.getParentid()); //设置服务对象类型 服务人类型(1-孕妇、2-儿童) pser.setPerType(ps.getPerType()); - if(ps.getPerType()!=null && ps.getPerType()==2){//儿童 + if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童 BabyModel babyModel = babyService.getOneBabyById(ps.getParentid()); if (babyModel != null) { pser.setPid(babyModel.getPid()); //如果有数据源id，取主档案id - if(StringUtils.isNotEmpty(babyModel.getSource())){ + if (StringUtils.isNotEmpty(babyModel.getSource())) { pser.setParentid(babyModel.getSource()); } } - }else{ + } else { Patients patients = patientsService.findOnePatientById(ps.getParentid()); if (patients != null) { pser.setPid(patients.getPid()); //如果有数据源id，取主档案id - if(StringUtils.isNotEmpty(patients.getSource())){ + if (StringUtils.isNotEmpty(patients.getSource())) { pser.setParentid(patients.getSource()); } } @@ -242,14 +242,14 @@ public class PatientServiceFacade { operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务"); - if(ps.getPerType()!=null&&ps.getPerType() == 2){//儿童建档服务数据处理 + if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童建档服务数据处理 - }else{//孕妇建档服务数据处理 - if(PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))){//孕期精准指导同步到建档 + } else {//孕妇建档服务数据处理 + if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))) {//孕期精准指导同步到建档 YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - bookbuildingFacade.updatePregnantById(ps.getParentid(),yunBookbuildingAddRequest, userId); + bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); } } } @@ -281,27 +281,30 @@ public class PatientServiceFacade { //开通人为上一次的数据，因为系统端不能修改，但是小程序可以修改 ps.setCreateUser(before.getCreateUser()); - if(before.getSerStatus()==PatientSerEnums.SerStatusEnums.td.getId()){//如果上一次是退订状态，重新开通，开通时间为当前时间 + if (before.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) {//如果上一次是退订状态，重新开通，开通时间为当前时间 ps.setCreateDate(new Date()); } patientServiceService.updatePatientService(ps); - if(PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()){//孕期精准指导同步到建档 - YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - if(ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()){ - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - }else if(ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()){ - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); - }else if(ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()){ - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); - }else if(ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()){ - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); + if (before.getPerType() != null && before.getPerType() == 2) {//儿童建档服务数据处理 + + } else {//孕妇建档服务数据处理 + if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {//孕期精准指导同步到建档 + YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); + yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); + } + bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); } - bookbuildingFacade.updatePregnantById(ps.getParentid(),yunBookbuildingAddRequest, userId); } - PatientService after = patientServiceService.getPatientService(ps.getId()); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, after, OptActionEnums.UPDATE.getId(), "修复服务"); BaseResponse baseResponse = new BaseResponse(); @@ -356,7 +359,7 @@ public class PatientServiceFacade { } catch (Exception e) { result.setUpdateUser("产检医生"); } - }else { + } else { result.setUpdateUser("小程序开通"); } result.setParentid(ps.getParentid()); @@ -566,7 +569,7 @@ public class PatientServiceFacade { BaseListResponse baseResponse = new BaseListResponse(); try { JSONObject formDataJson = JSONObject.fromObject(formData); - BasePageQueryRequest pageInfo = (BasePageQueryRequest) JSONObject.toBean(formDataJson,BasePageQueryRequest.class); + BasePageQueryRequest pageInfo = (BasePageQueryRequest) JSONObject.toBean(formDataJson, BasePageQueryRequest.class); PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setSynStatus(1); patientQuery.setSort("create_date"); @@ -581,12 +584,12 @@ public class PatientServiceFacade { for (PatientService ps : patientServices) { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", ps.getId()); - jsonObject.put("orderId", ps.getOrderId()==null?"":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()); //指定医生 - jsonObject.put("serDoct", ps.getSerDoct()==null?"":ps.getSerDoct()); + jsonObject.put("serDoct", ps.getSerDoct() == null ? "" : ps.getSerDoct()); //服务状态 jsonObject.put("serStatus", ps.getSerStatus()); jsonObject.put("hospitalId", ps.getHospitalId()); @@ -657,6 +660,7 @@ public class PatientServiceFacade { baseResponse.setErrormsg("成功"); return baseResponse; } + /** * 修改医院价格同步状态 * @@ -682,25 +686,24 @@ public class PatientServiceFacade { } - /** * 同步医院医生服务价格配置 * * @return */ - public BaseResponse syncHospitalService(){ + public BaseResponse syncHospitalService() { HospitalServiceContentQuery hospitalServiceContentQuery = new HospitalServiceContentQuery(); hospitalServiceContentQuery.setStatus(1); hospitalServiceContentQuery.setSyncStatus(0); hospitalServiceContentQuery.setPage(1); hospitalServiceContentQuery.setLimit(10); //查询未同步的数据 - List hospitalServiceContents= hospitalServiceContentService.queryHospitalServiceContent(hospitalServiceContentQuery); - List hospitalService=new ArrayList(); - List hospitalDoctService=new ArrayList(); + List hospitalServiceContents = hospitalServiceContentService.queryHospitalServiceContent(hospitalServiceContentQuery); + List hospitalService = new ArrayList(); + List hospitalDoctService = new ArrayList(); //判断是否有数据 - if(CollectionUtils.isNotEmpty(hospitalServiceContents)){ - for(HospitalServiceContent hospitalServiceContent:hospitalServiceContents){ + if (CollectionUtils.isNotEmpty(hospitalServiceContents)) { + for (HospitalServiceContent hospitalServiceContent : hospitalServiceContents) { hospitalService.add(convert(hospitalServiceContent)); } } @@ -711,17 +714,17 @@ public class PatientServiceFacade { hospitalDoctServiceQuery.setStatus(1); hospitalDoctServiceQuery.setSyncStatus(0); - List hospitalDoctServices=hospitalDoctServiceService.queryHospitalDoctService(hospitalDoctServiceQuery); + List hospitalDoctServices = hospitalDoctServiceService.queryHospitalDoctService(hospitalDoctServiceQuery); //判断是否有数据 - if(CollectionUtils.isNotEmpty(hospitalDoctServices)) { - for(HospitalDoctService hospitalServiceContent:hospitalDoctServices){ + if (CollectionUtils.isNotEmpty(hospitalDoctServices)) { + for (HospitalDoctService hospitalServiceContent : hospitalDoctServices) { hospitalDoctService.add(convert(hospitalServiceContent)); } } Map map1 = new HashMap(); - map1.put("hospitalDoctService",hospitalDoctService); - map1.put("hospitalService",hospitalService); + map1.put("hospitalDoctService", hospitalDoctService); + map1.put("hospitalService", hospitalService); BaseObjectResponse baseObjectResponse = new BaseObjectResponse(); baseObjectResponse.setData(map1); @@ -730,25 +733,25 @@ public class PatientServiceFacade { return baseObjectResponse; } - private Map convert(HospitalServiceContent serviceContent){ - Map map =new HashMap(); - map.put("create_date",serviceContent.getCreateDate().getTime()); - map.put("hospital_id",serviceContent.getHospitalId()); - map.put("id",serviceContent.getId()); - map.put("ser_price",serviceContent.getSerPrice()); - map.put("ser_type",serviceContent.getSerType()); - map.put("status",serviceContent.getStatus()); + private Map convert(HospitalServiceContent serviceContent) { + Map map = new HashMap(); + map.put("create_date", serviceContent.getCreateDate().getTime()); + map.put("hospital_id", serviceContent.getHospitalId()); + map.put("id", serviceContent.getId()); + map.put("ser_price", serviceContent.getSerPrice()); + map.put("ser_type", serviceContent.getSerType()); + map.put("status", serviceContent.getStatus()); return map; } - private Map convert(HospitalDoctService hospitalDoctService){ - Map map =new HashMap(); - map.put("doct_id",hospitalDoctService.getDoctId()); - map.put("doct_price",hospitalDoctService.getDoctPrice()); - map.put("id",hospitalDoctService.getId()); - map.put("hosp_id",hospitalDoctService.getHospId()); - map.put("hosp_service_id",hospitalDoctService.getHospServiceId()); - map.put("status",hospitalDoctService.getStatus()); + private Map convert(HospitalDoctService hospitalDoctService) { + Map map = new HashMap(); + map.put("doct_id", hospitalDoctService.getDoctId()); + map.put("doct_price", hospitalDoctService.getDoctPrice()); + map.put("id", hospitalDoctService.getId()); + map.put("hosp_id", hospitalDoctService.getHospId()); + map.put("hosp_service_id", hospitalDoctService.getHospServiceId()); + map.put("status", hospitalDoctService.getStatus()); return map; } -- 1.8.3.1