From 97b2b9fdb98c712ede40888ca29d291631607744 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 11 Dec 2017 18:07:28 +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 --- .../platform/common/enums/PatientSerEnums.java | 2 +- .../operate/web/controller/TestController.java | 67 +++++-- .../operate/web/facade/BabyBookbuildingFacade.java | 29 ++- .../operate/web/facade/PatientServiceFacade.java | 28 ++- .../operate/web/result/MatdeliverFollowResult.java | 5 + .../web/worker/BabyBuildSerToPatientSerWorker.java | 216 +++++++++++++++++++++ .../web/worker/BuildSerToPatientSerWorker.java | 5 +- 7 files changed, 332 insertions(+), 20 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java index 937efde..d956933 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java @@ -14,7 +14,7 @@ public class PatientSerEnums { //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) public enum SerTypeEnums { bzfw(6, "标准服务"), - yqjzzd(1, "孕期精准医疗"), + yqjzzd(1, "精准医疗指导"), tz(2, "体重管理"), xt(3, "血糖管理"), xy(4, "血压管理"), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 57ff032..505bb6d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -19,6 +19,7 @@ import com.lyms.platform.operate.web.facade.SieveFacade; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.service.SyncDataTaskService; +import com.lyms.platform.operate.web.worker.BabyBuildSerToPatientSerWorker; import com.lyms.platform.operate.web.worker.BuildSerToPatientSerWorker; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -80,9 +81,6 @@ public class TestController { private MatDeliverService matDeliverService; @Autowired - private BabyBookbuildingService babyBookbuildingService; - - @Autowired private BabyCheckService babyCheckService; @Autowired @@ -116,6 +114,9 @@ public class TestController { @Autowired private IBloodPressureService bloodPressureService; + @Autowired + private BabyBookbuildingService babyBookbuildingService; + @ResponseBody @RequestMapping("/init/blood/pressure") public BaseResponse initBloodPressure(@RequestParam Map param) { @@ -138,9 +139,53 @@ public class TestController { return datas; } - /** - * + * @param isSkip 是否增量添加 true:增量添加 + * @param isZjzx 是否对增值服务，开通专家咨询服务 true:开通增值服务 + * @return + */ + @RequestMapping(value = "/synBabyBuildToPatientService", method = RequestMethod.GET) + @ResponseBody + public BaseResponse synBabyBuildToPatientService( + @RequestParam(value = "isSkip") boolean isSkip, + @RequestParam(value = "isZjzx") boolean isZjzx + ) { + BabyModelQuery babyQuery = new BabyModelQuery(); + List list = new ArrayList(); + list.add("1");//转诊，建档已接受 + list.add("2");//隐藏建档 + babyQuery.setEnableListNot(list); + List buildType = new ArrayList(); + buildType.add(1);//儿童直接建档 + buildType.add(2);//产妇分娩建档 + babyQuery.setBuildTypeList(buildType); + babyQuery.setYn(YnEnums.YES.getId()); + + int patientCount = babyBookbuildingService.queryBabyCount(babyQuery); + System.out.println("一共需要处理数据量：" + patientCount); + + //计算每个线程需要处理的数据量,默认1000，必须是分页条数的倍数，不然多线程处理的数据会重复 + int batchSize = 1000; + if (patientCount > 10000) { + batchSize = 10000; + } + + int end = 0; + for (int i = 0; i < patientCount; i += batchSize) { + end = (end + batchSize); + if (end > patientCount) { + end = patientCount; + } + System.out.println("线程处理数据量：" + i + "--至--" + end); + commonThreadPool.submit(new BabyBuildSerToPatientSerWorker(i, end, babyBookbuildingService, patientServiceService, isSkip, isZjzx, batchSize, patientCount)); + } + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setErrormsg("一共需要处理数据量：" + patientCount); + return baseResponse; + } + + + /** 同步孕妇建档服务数据 * @param isSkip 是否增量添加 true:增量添加 * @param isZjzx 是否对增值服务，开通专家咨询服务 true:开通增值服务 * @return @@ -150,7 +195,7 @@ public class TestController { public BaseResponse synBuildToPatientService( @RequestParam(value = "isSkip") boolean isSkip, @RequestParam(value = "isZjzx") boolean isZjzx - ) { + ) { PatientsQuery patientsQuery = new PatientsQuery(); //排查本院隐藏建档 patientsQuery.setExtEnable(false); @@ -159,11 +204,11 @@ public class TestController { patientsQuery.setType(1); int patientCount = patientsService.queryPatientCount(patientsQuery); - System.out.println("一共需要处理数据量："+patientCount); + System.out.println("一共需要处理数据量：" + patientCount); //计算每个线程需要处理的数据量,默认1000，必须是分页条数的倍数，不然多线程处理的数据会重复 int batchSize = 1000; - if(patientCount>10000){ + if (patientCount > 10000) { batchSize = 10000; } @@ -173,11 +218,11 @@ public class TestController { if (end > patientCount) { end = patientCount; } - System.out.println("线程处理数据量："+i+"--至--"+end); - commonThreadPool.submit(new BuildSerToPatientSerWorker(i, end,patientsService,patientServiceService,isSkip,isZjzx,batchSize,patientCount)); + System.out.println("线程处理数据量：" + i + "--至--" + end); + commonThreadPool.submit(new BuildSerToPatientSerWorker(i, end, patientsService, patientServiceService, isSkip, isZjzx, batchSize, patientCount)); } BaseResponse baseResponse = new BaseResponse(); - baseResponse.setErrormsg("一共需要处理数据量："+patientCount); + baseResponse.setErrormsg("一共需要处理数据量：" + patientCount); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index dcb74f0..ecd8f89 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -313,6 +313,27 @@ public class BabyBookbuildingFacade { } /** + * 修改儿童服务开通信息 + * @param request + * @return + */ + public boolean updateBabySerInfo(BabyBookbuildingAddRequest request){ + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setId(request.getId()); + + List list = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(list)) { + BabyModel babyModel = list.get(0); + babyModel.setServiceType(request.getServiceType()); + babyModel.setServiceStatus(request.getServiceStatus()); + babyBookbuildingService.updateBabyBuild(babyModel, request.getId()); + } + + return true; + } + + /** * 修改儿童建档 * * @param request @@ -1932,8 +1953,8 @@ public class BabyBookbuildingFacade { babyQuery.setQueryNo(request.getQueryNo()); if(String.valueOf("true").equals(request.getIsArea())){ List list = new ArrayList(); - list.add("1"); - list.add("2"); + list.add("1");//转诊，建档已接受 + list.add("2");//隐藏建档 babyQuery.setEnableListNot(list); OrganizationQuery organizationQuery = new OrganizationQuery(); if(!StringUtils.isEmpty(request.getHospitalId())){ @@ -2040,8 +2061,8 @@ public class BabyBookbuildingFacade { List buildType = new ArrayList(); - buildType.add(1); - buildType.add(2); + buildType.add(1);//儿童直接建档 + buildType.add(2);//产妇分娩建档 babyQuery.setBuildTypeList(buildType); babyQuery.setYn(YnEnums.YES.getId()); 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 6c51402..68cc1d6 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 @@ -13,6 +13,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BasePageQueryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import com.lyms.platform.operate.web.result.PatientSerResult; @@ -60,6 +61,8 @@ public class PatientServiceFacade { private OperateLogFacade operateLogFacade; @Autowired private BookbuildingFacade bookbuildingFacade; + @Autowired + private BabyBookbuildingFacade babyBookbuildingFacade; public BaseResponse babyServiceInit(Integer userId) { Map map = new HashMap(); @@ -243,7 +246,13 @@ public class PatientServiceFacade { operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务"); if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童建档服务数据处理 - + if(PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()){ + BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); + babyBookbuildingAddRequest.setId(ps.getParentid()); + babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); + } } else {//孕妇建档服务数据处理 if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))) {//孕期精准指导同步到建档 YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); @@ -288,7 +297,20 @@ public class PatientServiceFacade { patientServiceService.updatePatientService(ps); if (before.getPerType() != null && before.getPerType() == 2) {//儿童建档服务数据处理 - + if(PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()){ + BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); + babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.gq.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) { + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); + } + babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); + } } else {//孕妇建档服务数据处理 if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {//孕期精准指导同步到建档 YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); @@ -306,7 +328,7 @@ public class PatientServiceFacade { } } PatientService after = patientServiceService.getPatientService(ps.getId()); - operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, after, OptActionEnums.UPDATE.getId(), "修复服务"); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, after, OptActionEnums.UPDATE.getId(), "修改服务"); BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); baseResponse.setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java index dfbdbdb..4c1782b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java @@ -261,6 +261,11 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel { } } + if (getContactResultStr() != null && getVisitResult() == 2) {//预约联系失败，不显示预约信息 + setMakeTypeStr(""); + setMakeVisitDateStr(""); + } + if (getVisitResult() != null && getVisitResult() == 2) {//访视失败，不显示随访信息 setDeliveryDateStr(""); setLeaveDateStr(""); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java new file mode 100644 index 0000000..7e0dc78 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java @@ -0,0 +1,216 @@ +package com.lyms.platform.operate.web.worker; + +import com.lyms.platform.biz.service.BabyBookbuildingService; +import com.lyms.platform.common.enums.PatientSerEnums; +import com.lyms.platform.common.enums.ServiceStatusEnums; +import com.lyms.platform.common.enums.ServiceTypeEnums; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.permission.model.PatientService; +import com.lyms.platform.permission.model.PatientServiceQuery; +import com.lyms.platform.permission.service.PatientServiceService; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.query.BabyModelQuery; + +import java.util.*; +import java.util.concurrent.Callable; + +/** + * @auther yangfei + * @createTime 2017年11月22日 11时28分 + * @discription + */ +public class BabyBuildSerToPatientSerWorker implements Callable { + private int startIndex; + private int endIndex; + private int batchSize; + private int allCount; + private boolean isSkip; + private boolean isZjzx; + private BabyBookbuildingService babyBookbuildingService; + private PatientServiceService patientServiceService; + + public BabyBuildSerToPatientSerWorker(int startIndex, int endIndex, BabyBookbuildingService babyBookbuildingService, PatientServiceService patientServiceService, boolean isSkip, boolean isZjzx, int batchSize, int allCount) { + this.allCount = allCount; + this.startIndex = startIndex; + this.endIndex = endIndex; + this.babyBookbuildingService = babyBookbuildingService; + this.patientServiceService = patientServiceService; + this.isSkip = isSkip; + this.isZjzx = isZjzx; + if (batchSize >= 1000) { + this.batchSize = 1000; + } else { + this.batchSize = batchSize; + } + } + + /** + * Computes a result, or throws an exception if unable to do so. + * + * @return computed result + */ + @Override + public Object call() { + try { + Map patientsMap = new HashMap<>(); + + for (int i = startIndex; i < endIndex; i += batchSize) { + BabyModelQuery babyQuery = new BabyModelQuery(); + List list = new ArrayList(); + list.add("1");//转诊，建档已接受 + list.add("2");//隐藏建档 + babyQuery.setEnableListNot(list); + List buildType = new ArrayList(); + buildType.add(1);//儿童直接建档 + buildType.add(2);//产妇分娩建档 + babyQuery.setBuildTypeList(buildType); + babyQuery.setYn(YnEnums.YES.getId()); + + babyQuery.setLimit(batchSize); + babyQuery.setPage((i + batchSize) / batchSize); + + System.out.println("总数据量："+allCount+"，正在处理第：" + i+"--到--"+(i+batchSize)+",page:"+babyQuery.getPage()+",limit:"+babyQuery.getLimit()); + + List patients = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + for (BabyModel pt : patients) { + if(StringUtils.isEmpty(pt.getId())){ + System.out.println("建档主键id为空："+pt.getId()); + }else if(patientsMap.containsKey(pt.getId())){//存在 + System.out.println("重复的主键："+pt.getId()); + }else{ + patientsMap.put(pt.getId(),1); + } + if (pt.getServiceType() == null) { + System.out.println("服务类型不存在跳过数据："+pt.getId()); + continue; + } + + PatientService pser = new PatientService(); + // 服务人类型(1-孕妇、2-儿童) + pser.setPerType(2); + + //服务类型 + if (pt.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) {//标准服务 + pser.setSerType(PatientSerEnums.SerTypeEnums.bzfw.getId()); + //标准服务状态转换成服务状态 + convertBZFWtoPserStatus(pt,pser); + + } else if (pt.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) {//增值服务 + //孕期精准指导 + pser.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); + //增值服务有服务医生 + pser.setSerDoct(pt.getBuildDoctor()); + + //增值服务状态转换为服务状态 + convertZZFWtoPserStatus(pt, pser); + if (isZjzx) {//增值服务是否:开通专家咨询服务 + //开通专家咨询服务 + PatientService pser2 = new PatientService(); + // 服务人类型(1-孕妇、2-儿童) + pser2.setPerType(2); + //数据转换 + convertPatient(pt, pser2); + //增值服务状态转换为服务状态 + convertZZFWtoPserStatus(pt, pser2); + + //专家咨询服务 + pser2.setSerType(PatientSerEnums.SerTypeEnums.zjzx.getId()); + if (isSkip) {//是否是增量 + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setParentid(pt.getId()); + patientQuery.setSerType(pser2.getSerType()); + + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isEmpty(patientServices)) { + //增值服务数据转换 + convertPatient(pt, pser2); + //增值服务有服务医生 + pser2.setSerDoct(pt.getBuildDoctor()); + patientServiceService.addPatientService(pser2); + } + } else { + convertPatient(pt, pser2); + //增值服务有服务医生 + pser2.setSerDoct(pt.getBuildDoctor()); + patientServiceService.addPatientService(pser2); + } + } + } + + convertPatient(pt,pser); + if (isSkip) {//是否是增量 + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setParentid(pt.getId()); + patientQuery.setSerType(pser.getSerType()); + + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isNotEmpty(patientServices)) { + continue; + } + } + //老数据服务标记 + patientServiceService.addPatientService(pser); + } + // System.out.println("endIndex:" + endIndex + "," + i + ":" + patients.size()); + } + + System.out.println("线程处理数据完成，开始条数："+startIndex+",结束条数："+endIndex+",map:"+ patientsMap.size()); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + public void convertPatient(BabyModel pt, PatientService pser2) { + pser2.setIsOld(1); + pser2.setCreateUser(pt.getBuildDoctor()); + pser2.setCreateDate(pt.getBuildDate()); + pser2.setParentid(pt.getId()); + pser2.setPid(pt.getPid()); + pser2.setId(UUID.randomUUID().toString().replace("-", "")); + pser2.setHospitalId(pt.getHospitalId()); + //默认已经领取 + pser2.setStatus(2); + //默认待同步 + pser2.setSynStatus(1); + //领取时间 + // pser.setReceiveDate(new Date()); + //服务开通操作时间 + pser2.setUpdateDate(pt.getBuildDate()); + //服务开通操作人 + pser2.setUpdateUser(pt.getBuildDoctor()); + } + + public void convertZZFWtoPserStatus(BabyModel pt, PatientService pser) { + if(pt.getServiceStatus() == null){ + System.out.println("增值服务没有服务状态："+pt.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()); + } + } + + public void convertBZFWtoPserStatus(BabyModel pt, PatientService pser) { + if(pt.getServiceStatus() == null){ + System.out.println("增值服务没有服务状态："+pt.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()); + } + + } +} 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 39ad53f..58ce801 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 @@ -88,7 +88,8 @@ public class BuildSerToPatientSerWorker implements Callable { } PatientService pser = new PatientService(); - + // 服务人类型(1-孕妇、2-儿童) + pser.setPerType(1); //服务类型 if (pt.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) {//标准服务 pser.setSerType(PatientSerEnums.SerTypeEnums.bzfw.getId()); @@ -106,6 +107,8 @@ public class BuildSerToPatientSerWorker implements Callable { if (isZjzx) {//增值服务是否:开通专家咨询服务 //开通专家咨询服务 PatientService pser2 = new PatientService(); + // 服务人类型(1-孕妇、2-儿童) + pser2.setPerType(2); //数据转换 convertPatient(pt, pser2); //增值服务状态转换为服务状态 -- 1.8.3.1