diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/JoinEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/JoinEnums.java index b77f88e..eaf54e5 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/JoinEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/JoinEnums.java @@ -9,7 +9,8 @@ import org.apache.commons.lang.StringUtils; */ public enum JoinEnums { O("已衔接", "1"), - O1("未衔接", "2")/*, + O1("未衔接", "2"), + O4("浮", "4")/*, O2("衔接", "3")*/; public static String getTitle(String id){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index 06c793c..6909a5b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -68,7 +68,7 @@ public class PatientServiceController extends BaseController { @RequestMapping(value = "/patSer", method = RequestMethod.GET) public BaseResponse findPatientServiceList(String pid, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientServiceFacade.findPatientServiceList(pid, loginState.getId()); + return patientServiceFacade.findPatientServiceList(pid); } /** @@ -116,6 +116,7 @@ public class PatientServiceController extends BaseController { return patientServiceFacade.findOnePatientService(id); } + /** * 根据条件查询开通服务记录 * 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 e3fd402..a64fa66 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 @@ -148,14 +148,12 @@ public class TestController { /** * @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 + @RequestParam(value = "isSkip") boolean isSkip ) { BabyModelQuery babyQuery = new BabyModelQuery(); List list = new ArrayList(); @@ -184,7 +182,7 @@ public class TestController { end = patientCount; } System.out.println("线程处理数据量：" + i + "--至--" + end); - commonThreadPool.submit(new BabyBuildSerToPatientSerWorker(i, end, babyBookbuildingService, patientServiceService, isSkip, isZjzx, batchSize, patientCount)); + commonThreadPool.submit(new BabyBuildSerToPatientSerWorker(i, end, babyBookbuildingService, patientServiceService, isSkip, batchSize, patientCount)); } BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrormsg("一共需要处理数据量：" + patientCount); 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 04e29c5..f91e064 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 @@ -15,7 +15,6 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import org.apache.commons.lang.math.NumberUtils; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BabyGuideSmsequest; import com.lyms.platform.operate.web.request.BabyManageRequest; @@ -27,6 +26,7 @@ import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; @@ -34,6 +34,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; @@ -131,6 +132,8 @@ public class BabyBookbuildingFacade { @Autowired private OperateLogFacade operateLogFacade; + @Autowired + private PatientServiceFacade patientServiceFacade; @Autowired @Qualifier("commonThreadPool") @@ -414,7 +417,8 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(list)) { BabyModel babyModel = list.get(0); pid=babyModel.getPid(); - if (!(babyModel.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId())) { + //新版服务开通，修改建档不能修改服务 + /*if (!(babyModel.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId())) { if (babyModel.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) { babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); @@ -424,7 +428,7 @@ public class BabyBookbuildingFacade { // createBuildSms(babyModel); createBuildMsg(babyModel); - } + }*/ } operateLogFacade.addModifyOptLog(userId, Integer.valueOf(model.getHospitalId()), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改儿童建档"); @@ -678,6 +682,8 @@ public class BabyBookbuildingFacade { model.setmHighRiskReason(request.getmHighRiskReason()); model.setPid(babyPersonId); model.setOperator(userId); + + if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) { String cardId = request.getMommyCertificateNum() + @@ -700,6 +706,25 @@ public class BabyBookbuildingFacade { // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档"); + //建档开通增值服务 + if (CollectionUtils.isNotEmpty(request.getSerInfos())) { + + PatientService patientService = new PatientService(); + patientService.setPerType(2); + patientService.setSerInfos(request.getSerInfos()); + patientService.setCreateUser(String.valueOf(userId)); + //开通日期与建档日期一致 + patientService.setCreateDate(DateUtil.parseYMD(request.getBuildDate())); + patientService.setParentid(model.getId()); + try { + patientServiceFacade.addPatientService(patientService, userId); + } catch (Exception e) { + System.out.println("儿童建档服务开通异常！"); + e.printStackTrace(); + } + } + + operateLogFacade.addAddOptLog(userId, Integer.valueOf(request.getHospitalId()), model, OptActionEnums.ADD.getId(), "儿童建档"); model = babyBookbuildingService.addBabyBookbuilding(model); if (model == null || model.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); @@ -1150,7 +1175,24 @@ public class BabyBookbuildingFacade { } - bm.setServiceStatus(b.getServiceStatus()); + // bm.setServiceStatus(b.getServiceStatus()); + // bm.setServiceType(b.getServiceType()); + + //建档开通增值服务,以前数据 + if (CollectionUtils.isNotEmpty(b.getSerInfos())) { + for (Map serInfo : b.getSerInfos()) { + //标准服务 + if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.bzfw.getId()) { + bm.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + bm.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + }else if(Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()){//增值服务：修改为孕期精准指导 + bm.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + bm.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + break; + } + } + } + bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); bm.setDueType(b.getDueType()); @@ -1158,7 +1200,6 @@ public class BabyBookbuildingFacade { bm.setDeliverOrg(b.getDeliverOrg()); bm.setBuildDoctor(b.getBuildDoctor()); bm.setBuildDate(DateUtil.parseYMD(b.getBuildDate())); - bm.setServiceType(b.getServiceType()); bm.setVcCardNo(b.getVcCardNo()); bm.setHospitalId(b.getHospitalId()); bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgarScore())); @@ -1237,7 +1278,9 @@ public class BabyBookbuildingFacade { if (models != null && models.size() > 0) { BabyModel model = models.get(0); result = getBabyBuildResult(model); - + BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); + List patientSerResults = (List) baseResponse.getObject(); + result.setPatientSerResults(patientSerResults); } /** 优惠券编号 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index ec9d075..17f42c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1290,7 +1290,7 @@ public class BookbuildingFacade { result.setLastMenstrualPeriodBasisDoctorId(p.getLastMenstrualPeriodBasisDoctorId()); } - BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id,userId); + BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); List patientSerResults = (List) baseResponse.getObject(); result.setPatientSerResults(patientSerResults); BaseObjectResponse objectResponse = new BaseObjectResponse(); 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 16123f0..adac325 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 @@ -4,10 +4,7 @@ import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.OptActionEnums; -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.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -116,10 +113,9 @@ public class PatientServiceFacade { * 根据孕妇id查询服务记录 * * @param pid - * @param id * @return */ - public BaseResponse findPatientServiceList(String pid, Integer id) { + public BaseResponse findPatientServiceList(String pid) { //查询档案信息 Patients patients = patientsService.findOnePatientById(pid); @@ -347,22 +343,31 @@ public class PatientServiceFacade { } PatientSerResult result = new PatientSerResult(); result.setId(ps.getId()); - Patients patients = patientsService.findOnePatientById(ps.getParentid()); - if (null != patients) { - String weekDesc = DateUtil.getWeekDesc(patients.getLastMenses(), new Date()); - result.setcDueWeek(weekDesc); - if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) - result.setcDueWeek("终止妊娠"); - else if (patients.getType() == 3) { - result.setcDueWeek("已分娩"); + if(ps.getPerType()!=null&&ps.getPerType()==2){//儿童 + BabyModel model = babyService.getOneBabyById(ps.getParentid()); + result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); + result.setBabyName(StringUtils.emptyDeal(model.getName())); + result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); + result.setName(StringUtils.emptyDeal(model.getMname())); + result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); + }else { + Patients patients = patientsService.findOnePatientById(ps.getParentid()); + if (null != patients) { + String weekDesc = DateUtil.getWeekDesc(patients.getLastMenses(), new Date()); + result.setcDueWeek(weekDesc); + if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) + result.setcDueWeek("终止妊娠"); + else if (patients.getType() == 3) { + result.setcDueWeek("已分娩"); + } + result.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); + result.setName(patients.getUsername()); + result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + //高危因素 + result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId())); + //高危等级颜色 + result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId())); } - result.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); - result.setName(patients.getUsername()); - result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); - //高危因素 - result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId())); - //高危等级颜色 - result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId())); } if (StringUtils.isNotEmpty(ps.getHospitalId())) {//查询医院名称 //判断ID是否存在 @@ -374,9 +379,13 @@ public class PatientServiceFacade { } if (StringUtils.isNotEmpty(ps.getUpdateUser())) { try { - Users users = usersService.getUsers(Integer.parseInt(ps.getUpdateUser())); - if (users != null) { - result.setUpdateUser(users.getName()); + if(StringUtils.isNum(ps.getUpdateUser())) { + Users users = usersService.getUsers(Integer.parseInt(ps.getUpdateUser())); + if (users != null) { + result.setUpdateUser(users.getName()); + } + }else{ + result.setUpdateUser("产检医生"); } } catch (Exception e) { result.setUpdateUser("产检医生"); @@ -428,6 +437,7 @@ public class PatientServiceFacade { return result; } + /** * 根据条件查询开通服务记录 * @@ -441,7 +451,7 @@ public class PatientServiceFacade { * @return */ public BaseListResponse getPatientService(Integer serType,Integer perType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) { -//根据用户id获取医院ID + //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setHospitalId(hospitalId); @@ -786,4 +796,5 @@ public class PatientServiceFacade { return map; } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index fbbdd41..5830d0e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -134,7 +134,7 @@ public class ViewFacade { map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getFuckLastMens())); } map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasisDoctorId())); - BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id, 0); + BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); List patientSerResults = (List) baseResponse.getObject(); map.put("patientSerResults", patientSerResults); //显示服务信息 @@ -2945,6 +2945,10 @@ public class ViewFacade { if (models != null && models.size() > 0) { BabyModel model = models.get(0); + BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); + List patientSerResults = (List) baseResponse.getObject(); + result.setPatientSerResults(patientSerResults); + result = result.convertToResult(model); result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason())); result.setBabyHighRiskReason(mongoUtil.findNames(model.getBabyHighRiskReason())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 95a5f54..ccd3368 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -16,6 +16,19 @@ public class BabyBookbuildingAddRequest { // 儿童高危因素标记 private List babyHighRiskReason; + /** + * 服务信息 + */ + private List> serInfos; + + public List> getSerInfos() { + return serInfos; + } + + public void setSerInfos(List> serInfos) { + this.serInfos = serInfos; + } + public List getBabyHighRiskReason() { return babyHighRiskReason; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index f534c8c..410f6ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -22,6 +22,17 @@ public class BabyBuildResult { private List mHighRiskReason2; + //显示服务信息 + private List patientSerResults; + + public List getPatientSerResults() { + return patientSerResults; + } + + public void setPatientSerResults(List patientSerResults) { + this.patientSerResults = patientSerResults; + } + public List getmHighRiskReason2() { return mHighRiskReason2; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index e1a84ba..6b67729 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -32,6 +32,9 @@ public class BabyPageResult implements IBasicResultConvert mHighRiskReason; + //显示服务信息 + private List patientSerResults; + public List getmHighRiskReason() { return mHighRiskReason; } @@ -178,6 +181,14 @@ public class BabyPageResult implements IBasicResultConvert getPatientSerResults() { + return patientSerResults; + } + + public void setPatientSerResults(List patientSerResults) { + this.patientSerResults = patientSerResults; + } + public String getId() { return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java index 7cb295a..e8497b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java @@ -11,7 +11,7 @@ import java.util.Map; public class PatientSerResult { private String id; /** - * 孕妇id + * 孕妇id、儿童id */ private String parentid; /** @@ -21,13 +21,31 @@ public class PatientSerResult { /** * 孕妇姓名 */ - private String name; /** * 孕妇年龄 */ private String age; /** + * 儿童名称 + */ + + private String babyName; + /** + * 性别 + */ + private String sex; + /** + * 月龄 + */ + private String monthAge; + + /** + * 出生日期 + */ + private String birthday; + + /** * 当前孕周 */ private String cDueWeek; @@ -101,6 +119,38 @@ public class PatientSerResult { */ private String backUser; + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getBabyName() { + return babyName; + } + + public void setBabyName(String babyName) { + this.babyName = babyName; + } + + public String getMonthAge() { + return monthAge; + } + + public void setMonthAge(String monthAge) { + this.monthAge = monthAge; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + public String getHospitalName() { return hospitalName; } 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 index 7e0dc78..4e038c7 100644 --- 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 @@ -27,18 +27,16 @@ public class BabyBuildSerToPatientSerWorker implements Callable { 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) { + public BabyBuildSerToPatientSerWorker(int startIndex, int endIndex, BabyBookbuildingService babyBookbuildingService, PatientServiceService patientServiceService, boolean isSkip, 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 { @@ -67,6 +65,7 @@ public class BabyBuildSerToPatientSerWorker implements Callable { buildType.add(2);//产妇分娩建档 babyQuery.setBuildTypeList(buildType); babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setNeed("need"); babyQuery.setLimit(batchSize); babyQuery.setPage((i + batchSize) / batchSize); @@ -92,51 +91,18 @@ public class BabyBuildSerToPatientSerWorker implements Callable { 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()) {//增值服务 - //孕期精准指导 + 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); - } - } + }else{//标准服务 + pser.setSerType(PatientSerEnums.SerTypeEnums.bzfw.getId()); + //标准服务状态转换成服务状态 + convertBZFWtoPserStatus(pt,pser); } convertPatient(pt,pser); @@ -166,7 +132,16 @@ public class BabyBuildSerToPatientSerWorker implements Callable { public void convertPatient(BabyModel pt, PatientService pser2) { pser2.setIsOld(1); pser2.setCreateUser(pt.getBuildDoctor()); - pser2.setCreateDate(pt.getBuildDate()); + if(pt.getBuildDate()!=null){ + pser2.setCreateDate(pt.getBuildDate()); + }else{ + pser2.setCreateDate(new Date()); + } //服务开通操作时间 + if(pt.getBuildDate()!=null){ + pser2.setUpdateDate(pt.getBuildDate()); + }else{ + pser2.setUpdateDate(new Date()); + } pser2.setParentid(pt.getId()); pser2.setPid(pt.getPid()); pser2.setId(UUID.randomUUID().toString().replace("-", "")); @@ -177,17 +152,12 @@ public class BabyBuildSerToPatientSerWorker implements Callable { 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()) { @@ -197,12 +167,14 @@ public class BabyBuildSerToPatientSerWorker implements Callable { } else if (pt.getServiceStatus() == ServiceStatusEnums.SUSPEND.getId()) { pser.setSerStatus(PatientSerEnums.SerStatusEnums.zt.getId()); } - } - public void convertBZFWtoPserStatus(BabyModel pt, PatientService pser) { - if(pt.getServiceStatus() == null){ + if(pser.getSerStatus() == null){ System.out.println("增值服务没有服务状态："+pt.getId()); + pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); } + } + + public void convertBZFWtoPserStatus(BabyModel pt, PatientService pser) { //默认开通状态 if (pt.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId()) { pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); @@ -212,5 +184,10 @@ public class BabyBuildSerToPatientSerWorker implements Callable { pser.setSerStatus(PatientSerEnums.SerStatusEnums.gq.getId()); } + if(pser.getSerStatus() == null){ + System.out.println("标准服务没有服务状态："+pt.getId()); + pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); + } + } }