diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java index 0b8dcb8..4bf6949 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java @@ -8,6 +8,7 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.Date; @@ -65,10 +66,11 @@ public class TrackDownRecordService { public List queryTrackDown(TrackDownRecordQuery query) { MongoQuery query1 = query.convertToQuery(); + if (StringUtils.isNotEmpty(query.getNeed())) { query.mysqlBuild(iTrackDownRecordDao.queryTrackDownCount(query1)); query1.start(query.getOffset()).end(query.getLimit()); } - return iTrackDownRecordDao.queryTrackDown(query1); + return iTrackDownRecordDao.queryTrackDown(query1.addOrder(Sort.Direction.DESC, "modified")); } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java index e945722..f469e41 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java @@ -37,6 +37,8 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ private List pids; private String hospitalId; private String residentsArchiveId; + private String source; + private String status; /** * 末次月经 */ @@ -51,6 +53,22 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ return trackTypes; } + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + public void setTrackTypes(List trackTypes) { this.trackTypes = trackTypes; } @@ -153,6 +171,14 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ @Override public MongoQuery convertToQuery() { MongoCondition condition=MongoCondition.newInstance(); + + if(StringUtils.isNotEmpty(status)){ + condition= condition.and("status",status, MongoOper.IS); + }else{ + //默认只查询显示的数据 + condition= condition.and("status",1, MongoOper.IS); + } + if(StringUtils.isNotEmpty(provinceId)){ condition= condition.and("provinceId",provinceId, MongoOper.IS); } @@ -177,8 +203,19 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ if (null != trackTypes) { condition = condition.and("trackType", trackTypes, MongoOper.IN); } - if(StringUtils.isNotEmpty(parentId)){ - condition = condition.and("parentId", parentId, MongoOper.IS); + + if(StringUtils.isNotEmpty(source)&&StringUtils.isNotEmpty(parentId)){ + MongoCondition con1 = MongoCondition.newInstance("source", source, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("parentId", parentId, MongoOper.IS); + condition = condition.orCondition(new MongoCondition[]{con1, con2}); + + }else { + if (StringUtils.isNotEmpty(source)) { + condition = condition.and("source", source, MongoOper.IS); + } + if (StringUtils.isNotEmpty(parentId)) { + condition = condition.and("parentId", parentId, MongoOper.IS); + } } if (null != pids) { condition = condition.and("pid", pids, MongoOper.IN); 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 cd4983a..2d9a6d6 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 @@ -145,6 +145,10 @@ public class BookbuildingFacade { private ITrackDownService trackDownService; @Autowired private TrackDownRecordService trackDownRecordService; + + @Autowired + private ResidentsArchiveService residentsArchiveService; + /** * 根据患者的建档ID，查询还未使用的免费产检查券 * @@ -277,27 +281,46 @@ public class BookbuildingFacade { //添加产后追访信息 TrackDownRecord trackDownRecord = patient.build(); - //添加产后追访信息 - TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); - downRecordQuery.setParentId(trackDownRecord.getParentId()); - List records = trackDownRecordService.queryTrackDown(downRecordQuery); - if(CollectionUtils.isNotEmpty(records)){ - TrackDownRecord trackDownRecord1 = records.get(0); - if(trackDownRecord1.getStatus()==1&&trackDownRecord.getTrackType()!=TrackDownDateEnums.C.getId()){ - trackDownRecord.setHospitalId(yunRequest.getHospitalId()); - trackDownRecord.setSource(patient.getId()); - trackDownRecord.setTrackType(TrackDownDateEnums.C.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setYn(YnEnums.YES.getId()); + archiveQuery.setHospitalId(yunRequest.getHospitalId()); + + boolean isSaveTrack = true; + + if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getCardNo())) { + archiveQuery.setCertificateNum(patient.getCardNo()); + List residents = residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(residents) && residents.get(0) != null) { + ResidentsArchiveModel archiveModel = residents.get(0); + //添加产后追访信息 + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setSource(archiveModel.getId()); + List records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {//修改 + TrackDownRecord trackDownRecord1 = records.get(0); + if (trackDownRecord1.getStatus() == 1 && trackDownRecord1.getTrackType() < TrackDownDateEnums.C.getId()) { + trackDownRecord.setHospitalId(yunRequest.getHospitalId()); + trackDownRecord.setSource(trackDownRecord1.getId()); + trackDownRecord.setTrackType(TrackDownDateEnums.C.getId()); + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); + isSaveTrack = false; + } + } } - }else{ + } + + //新增 + if(isSaveTrack){ trackDownRecord.setHospitalId(yunRequest.getHospitalId()); trackDownRecord.setSource(patient.getId()); trackDownRecord.setStatus(1); trackDownRecord.setTrackType(TrackDownDateEnums.C.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } + operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), p, OptActionEnums.ADD.getId(), "孕妇建档"); /** 孕妇建档后把所有以前未使用的优惠券作废 */ @@ -383,7 +406,7 @@ public class BookbuildingFacade { patientService.setCreateDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate())); patientService.setParentid(p.getId()); try { - patientServiceFacade.addPatientService(patientService, userId,yunRequest.getHospitalId()); + patientServiceFacade.addPatientService(patientService, userId, yunRequest.getHospitalId()); } catch (Exception e) { System.out.println("孕妇建档服务开通异常！"); e.printStackTrace(); @@ -535,20 +558,20 @@ public class BookbuildingFacade { downRecordQuery.setParentId(trackDownRecord.getParentId()); List records = trackDownRecordService.queryTrackDown(downRecordQuery); - if(CollectionUtils.isNotEmpty(records)){ + if (CollectionUtils.isNotEmpty(records)) { TrackDownRecord trackDownRecord1 = records.get(0); - if(trackDownRecord1.getStatus()==1&&trackDownRecord.getTrackType()!=TrackDownDateEnums.C.getId()){ + if (trackDownRecord1.getStatus() == 1 && trackDownRecord.getTrackType() != TrackDownDateEnums.C.getId()) { trackDownRecord.setHospitalId(yunRequest.getHospitalId()); trackDownRecord.setSource(patient.getId()); trackDownRecord.setTrackType(TrackDownDateEnums.C.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } - }else{ + } else { trackDownRecord.setHospitalId(yunRequest.getHospitalId()); trackDownRecord.setSource(patient.getId()); trackDownRecord.setStatus(1); trackDownRecord.setTrackType(TrackDownDateEnums.C.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } @@ -656,17 +679,14 @@ public class BookbuildingFacade { if (templateModel != null && templateModel.getStatus() == 1) { //推送类型模板 - if (templateModel.getTemplateType() == null || templateModel.getTemplateType() == 0) - { + if (templateModel.getTemplateType() == null || templateModel.getTemplateType() == 0) { //发送推送类模板建档 - if (startType == 3) - { + if (startType == 3) { continue; } } //发送短信类模板建档 - else if(templateModel.getTemplateType() == 1 && startType == 1) - { + else if (templateModel.getTemplateType() == 1 && startType == 1) { continue; } @@ -700,7 +720,7 @@ public class BookbuildingFacade { messages.add(mr); ExceptionUtils.catchException("patient build msg = " + messages); if (CollectionUtils.isNotEmpty(messages)) { - smsConfigFacade.saveMsg(messages,patient.getHospitalId()); + smsConfigFacade.saveMsg(messages, patient.getHospitalId()); } } } @@ -725,7 +745,6 @@ public class BookbuildingFacade { */ public BaseResponse updatePregnantById(String id, YunBookbuildingAddRequest yunRequest, Integer userId) { - BaseResponse br = new BaseResponse(); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); @@ -834,7 +853,7 @@ public class BookbuildingFacade { //更新产后追访信息 TrackDownRecord trackDownRecord = patient.build(); - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(beforePatient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); @@ -892,12 +911,9 @@ public class BookbuildingFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy - if ("1000000114".equals(hospitalId)) - { + if ("1000000114".equals(hospitalId)) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(bookbuildingQueryRequest.getVcCardNo())); - } - else - { + } else { patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo()); } @@ -1179,7 +1195,7 @@ public class BookbuildingFacade { if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.bzfw.getId()) { patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - }else if(Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()){//增值服务：修改为孕期精准指导 + } else if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()) {//增值服务：修改为孕期精准指导 patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); break; @@ -1217,7 +1233,7 @@ public class BookbuildingFacade { Patients p = patients.get(0); result = getResult(p); /** 末次月经和纠正末次月经反起来返回 */ - if(p.getFuckLastMens() != null) { + if (p.getFuckLastMens() != null) { result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses())); result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getFuckLastMens())); } @@ -1929,7 +1945,7 @@ public class BookbuildingFacade { } - public String getPatientBuildId(String certType, String certNo,String hospitalId,Integer valueType) { + public String getPatientBuildId(String certType, String certNo, String hospitalId, Integer valueType) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(certNo); patientsQuery.setPcerteTypeId(certType); @@ -1937,18 +1953,13 @@ public class BookbuildingFacade { patientsQuery.setHospitalId(hospitalId); List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); String patientId = ""; - if (CollectionUtils.isNotEmpty(patients)) - { + if (CollectionUtils.isNotEmpty(patients)) { patientId = patients.get(0).getId(); - if (valueType == 1) - { + if (valueType == 1) { PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.get(0).getPid())), PatientWeight.class); - if (pw == null) - { + if (pw == null) { patientId = ""; - } - else - { + } else { patientId = pw.getPatientId(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 52aa3ec..f8a51fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.OptActionEnums; -import com.lyms.platform.common.enums.TrackDownDateEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -132,11 +131,10 @@ public class FolicAcidFacade { model.setVcCardNo(addRequest.getVcCardNo()); ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); + //新增婚检追访信息 TrackDownRecord record = residentsArchiveModel.build(); - record.setStatus(1); - record.setTrackType(TrackDownDateEnums.A.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,residentsArchiveModel.build()); + trackDownService.addOrupdateTrackDownRecord(userId,record); id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId()); }else { id = addOrUpdate(addRequest,userId,addRequest.getParentId()); 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 cea6b44..e008ab6 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 @@ -255,7 +255,7 @@ public class PatientServiceFacade { babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); - }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == ps.getSerType().intValue()) { + }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); babyBookbuildingAddRequest.setId(ps.getParentid()); babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); @@ -268,7 +268,7 @@ public class PatientServiceFacade { yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); - }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()){ + }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))){ YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 5945ff3..4dd260b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -736,22 +736,23 @@ public class PremaritalCheckupFacade { checkup.setHospitalId(addRequest.getHospitalId()); PremaritalCheckup premaritalCheckup = premaritalCheckupService.addPremaritalCheckup(checkup); id = premaritalCheckup.getId(); + } - //新增婚前检查结束,男的结束流程，女的进入怀孕建档） - if (model.getSex().equals(SystemConfig.WOMAN_ID)) { - //新增婚检追访信息 - TrackDownRecord record = model.build(); - record.setStatus(1); - record.setTrackType(TrackDownDateEnums.B.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,record); - } else if (model.getSex().equals(SystemConfig.MAN_ID)) { - //新增婚检追访信息 - TrackDownRecord record = model.build(); - record.setStatus(0); - trackDownService.addOrupdateTrackDownRecord(userId,record); - } - + //新增婚前检查结束,男的结束流程，女的进入怀孕建档） + if (model.getSex().equals(SystemConfig.WOMAN_ID)) { + //新增婚检追访信息 + TrackDownRecord record = model.build(); + record.setStatus(1); + record.setTrackType(TrackDownDateEnums.B.getId()); + trackDownService.addOrupdateTrackDownRecord(userId,record); + } else if (model.getSex().equals(SystemConfig.MAN_ID)) { + //新增婚检追访信息 + TrackDownRecord record = model.build(); + record.setStatus(0); + record.setTrackType(TrackDownDateEnums.A.getId()); + trackDownService.addOrupdateTrackDownRecord(userId,record); } + return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 5f1b7df..065ebdb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -1,10 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.beans.MsgRequest; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.PremaritalCheckupService; -import com.lyms.platform.biz.service.ResidentsArchiveService; -import com.lyms.platform.biz.service.SyncDataService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; @@ -68,6 +65,8 @@ public class ResidentsArchiveFacade{ private SyncDataService syncDataService; @Autowired private ITrackDownService trackDownService; + @Autowired + private TrackDownRecordService trackDownRecordService; public BaseObjectResponse findResidentsArchive(ResidentsArchiveQueryRequest queryRequest,Integer userId){ @@ -82,7 +81,6 @@ public class ResidentsArchiveFacade{ residents = residentsArchiveService.queryResident(archiveQuery); }else if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())){ //通过用户ID查询医院ID - archiveQuery.setVcCardNo(queryRequest.getVcCardNo()); archiveQuery.setHospitalId(hospitalId); List archiveModelList = residentsArchiveService.queryResident(archiveQuery); @@ -298,8 +296,10 @@ public class ResidentsArchiveFacade{ model.setId(id); residentsArchiveService.updateResident(model,id); + + TrackDownRecord record = model.build(); //修改追访基本信息 - trackDownService.addOrupdateTrackDownRecord(userId,model.build()); + trackDownService.addOrupdateTrackDownRecord(userId,record); }catch (Exception e){ return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("系统异常,修改数据失败"); @@ -384,9 +384,7 @@ public class ResidentsArchiveFacade{ //新增婚检追访信息 TrackDownRecord record = residentsArchiveModel.build(); - record.setStatus(1); - record.setTrackType(TrackDownDateEnums.A.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,residentsArchiveModel.build()); + trackDownService.addOrupdateTrackDownRecord(userId,record); if (residentsArchiveModel == null || StringUtils.isEmpty(residentsArchiveModel.getId())){ br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 4cc7203..add87a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -129,7 +129,7 @@ public class TrackDownFacade { downRecordQuery.setPage(downQueryRequest.getPage()); downRecordQuery.setLimit(downQueryRequest.getLimit()); downRecordQuery.setNeed("1"); - downRecordQuery.setSort("modified desc"); + // downRecordQuery.setSort("modified desc"); downRecordQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); return downRecordQuery; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index ccb039d..82306ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -184,16 +184,26 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS public boolean addOrupdateTrackDownRecord(Integer userId, TrackDownRecord trackDownRecord) { try { TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setSource(trackDownRecord.getSource()); downRecordQuery.setParentId(trackDownRecord.getParentId()); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if(CollectionUtils.isNotEmpty(records)){ TrackDownRecord trackDownRecord1 = records.get(0); + //流程只能往下流转，不能往上回退 + if(trackDownRecord.getTrackType()!=null&&trackDownRecord1.getTrackType().intValue()>trackDownRecord.getTrackType()){ + trackDownRecord.setTrackType(trackDownRecord1.getTrackType()); + } + //由显示修改成不显示，后期数据更新时，不允许将不显示修改成显示。 + if(trackDownRecord1.getStatus()>trackDownRecord.getStatus()){ + trackDownRecord1.setStatus(trackDownRecord.getStatus()); + } trackDownRecordService.updateTrackDown(trackDownRecord,trackDownRecord1.getId()); }else{ trackDownRecordService.addTrackDown(trackDownRecord); } return true; }catch (Exception e){ + e.printStackTrace(); return false; } }