From d94987fd4c56eb6971f19b7c4aa8dc929c140aa5 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 1 Mar 2018 16:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=95=B0=E6=8D=AE=E4=B8=AA?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9B=B4=E6=96=B0bug=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E8=BD=AE=E8=87=AA=E6=B5=8Bbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/Patients.java | 1 + .../lyms/platform/query/TrackDownRecordQuery.java | 94 ++++++++++++------ .../operate/web/facade/BookbuildingFacade.java | 108 +++++++++------------ .../operate/web/facade/ResidentsArchiveFacade.java | 45 ++++++++- .../web/service/impl/TrackDownServiceImpl.java | 75 +++++++------- 5 files changed, 189 insertions(+), 134 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 71cd187..6f821c8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -1178,6 +1178,7 @@ public class Patients extends BaseModel { downRecord.setAreaRegisterId(getAreaRegisterId()); //默认值 downRecord.setHospitalId(getHospitalId()); + downRecord.setSource(getId()); downRecord.setStatus(1); downRecord.setTrackType(TrackDownDateEnums.C.getId()); return downRecord; 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 f469e41..2bb4356 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 @@ -26,6 +26,7 @@ import java.util.List; * @since BME V100R001C40B104 */ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQuery { + private String id; private String provinceId; private String cityId; private String areaId; @@ -39,6 +40,8 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ private String residentsArchiveId; private String source; private String status; + private String cardNo; + private String phone; /** * 末次月经 */ @@ -49,6 +52,30 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ */ private Date lastMensesEnd; + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + public List getTrackTypes() { return trackTypes; } @@ -168,55 +195,62 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ public void setTrackType(Integer trackType) { this.trackType = trackType; } + @Override public MongoQuery convertToQuery() { - MongoCondition condition=MongoCondition.newInstance(); + MongoCondition condition = MongoCondition.newInstance(); - if(StringUtils.isNotEmpty(status)){ - condition= condition.and("status",status, MongoOper.IS); - }else{ + if (StringUtils.isNotEmpty(status)) { + condition = condition.and("status", status, MongoOper.IS); + } else { //默认只查询显示的数据 - condition= condition.and("status",1, MongoOper.IS); + condition = condition.and("status", 1, MongoOper.IS); + } + + if (StringUtils.isNotEmpty(id)) { + condition = condition.and("id", id, MongoOper.IS); + } + + if (StringUtils.isNotEmpty(phone)) { + condition = condition.and("phone", phone, MongoOper.IS); + } + + if (StringUtils.isNotEmpty(cardNo)) { + condition = condition.and("cardNo", cardNo, MongoOper.IS); } - if(StringUtils.isNotEmpty(provinceId)){ - condition= condition.and("provinceId",provinceId, MongoOper.IS); + if (StringUtils.isNotEmpty(provinceId)) { + condition = condition.and("provinceId", provinceId, MongoOper.IS); } - if(StringUtils.isNotEmpty(residentsArchiveId)){ - condition= condition.and("residentsArchiveId",residentsArchiveId, MongoOper.IS); + if (StringUtils.isNotEmpty(residentsArchiveId)) { + condition = condition.and("residentsArchiveId", residentsArchiveId, MongoOper.IS); } - if(StringUtils.isNotEmpty(cityId)){ - condition= condition.and("cityId",cityId, MongoOper.IS); + if (StringUtils.isNotEmpty(cityId)) { + condition = condition.and("cityId", cityId, MongoOper.IS); } - if(StringUtils.isNotEmpty(areaId)){ - condition= condition.and("areaId",areaId, MongoOper.IS); + if (StringUtils.isNotEmpty(areaId)) { + condition = condition.and("areaId", areaId, MongoOper.IS); } - if(StringUtils.isNotEmpty(hospitalId)){ - condition= condition.and("hospitalId",hospitalId, MongoOper.IS); + if (StringUtils.isNotEmpty(hospitalId)) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } - if(StringUtils.isNotEmpty(streetId)){ + if (StringUtils.isNotEmpty(streetId)) { condition = condition.and("streetId", streetId, MongoOper.IS); } - if(null!=trackType){ + if (null != trackType) { condition = condition.and("trackType", trackType, MongoOper.IS); } if (null != trackTypes) { condition = condition.and("trackType", trackTypes, MongoOper.IN); } - 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 (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); } @@ -224,7 +258,7 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ Criteria c1 = null; - if(StringUtils.isNotEmpty(key)){ + if (StringUtils.isNotEmpty(key)) { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("phone", key, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("username", "^" + key, MongoOper.LIKE); 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 2d9a6d6..475b8f3 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 @@ -279,47 +279,8 @@ public class BookbuildingFacade { //新增孕妇档案 Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); - //添加产后追访信息 - TrackDownRecord trackDownRecord = patient.build(); - - - 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; - } - } - } - } - - //新增 - if(isSaveTrack){ - trackDownRecord.setHospitalId(yunRequest.getHospitalId()); - trackDownRecord.setSource(patient.getId()); - trackDownRecord.setStatus(1); - trackDownRecord.setTrackType(TrackDownDateEnums.C.getId()); - trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); - } - + //添加追访信息 + addTrackDownInfo(userId, p, yunRequest); operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), p, OptActionEnums.ADD.getId(), "孕妇建档"); @@ -425,7 +386,48 @@ public class BookbuildingFacade { br.setErrormsg("成功"); br.setData(p.getId()); return br; + } + /** + * 添加或更新追访信息 + * @param userId + * @param patient + * @param yunRequest + */ + public void addTrackDownInfo(Integer userId, Patients patient, YunBookbuildingAddRequest yunRequest) { + //添加产后追访信息 + TrackDownRecord trackDownRecord = patient.build(); + //根据patient查询是否存在追访信息 + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setParentId(patient.getId()); + List records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 + TrackDownRecord trackDownRecord1 = records.get(0); + trackDownRecord.setId(trackDownRecord1.getId()); + } else {//不存在查询居民健康档案是否存在追访 + //查询居民健康档案 + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setYn(YnEnums.YES.getId()); + archiveQuery.setHospitalId(yunRequest.getHospitalId()); + + if (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); + //添加产后追访信息 + downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setSource(archiveModel.getId()); + records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {//修改 + TrackDownRecord trackDownRecord1 = records.get(0); + trackDownRecord.setId(trackDownRecord1.getId()); + } + } + } + } + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } /** @@ -553,27 +555,10 @@ 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); - } - } else { - trackDownRecord.setHospitalId(yunRequest.getHospitalId()); - trackDownRecord.setSource(patient.getId()); - trackDownRecord.setStatus(1); - trackDownRecord.setTrackType(TrackDownDateEnums.C.getId()); - trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); - } + //添加追访信息 + addTrackDownInfo(userId, p, yunRequest); operateLogFacade.addAddOptLog(userId, Integer.valueOf(patient.getHospitalId()), patient, OptActionEnums.ADD.getId(), "孕妇建档"); @@ -852,8 +837,7 @@ public class BookbuildingFacade { yunBookbuildingService.updatePregnant(patient, id); //更新产后追访信息 - TrackDownRecord trackDownRecord = patient.build(); - trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); + addTrackDownInfo(userId,patient,yunRequest); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(beforePatient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); 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 065ebdb..27a0f88 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 @@ -27,6 +27,7 @@ import com.lyms.platform.pojo.SmsConfigModel; import com.lyms.platform.pojo.TrackDownRecord; import com.lyms.platform.query.PremaritalCheckupQuery; import com.lyms.platform.query.ResidentsArchiveQuery; +import com.lyms.platform.query.TrackDownRecordQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -297,9 +298,8 @@ public class ResidentsArchiveFacade{ model.setId(id); residentsArchiveService.updateResident(model,id); - TrackDownRecord record = model.build(); //修改追访基本信息 - trackDownService.addOrupdateTrackDownRecord(userId,record); + addTrackDownInfo(userId,model); }catch (Exception e){ return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("系统异常,修改数据失败"); @@ -382,9 +382,8 @@ public class ResidentsArchiveFacade{ ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(archiveModel); - //新增婚检追访信息 - TrackDownRecord record = residentsArchiveModel.build(); - trackDownService.addOrupdateTrackDownRecord(userId,record); + //新增婚检追访信息，默认进入婚检追访 + addTrackDownInfo(userId,residentsArchiveModel); if (residentsArchiveModel == null || StringUtils.isEmpty(residentsArchiveModel.getId())){ br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); @@ -398,6 +397,42 @@ public class ResidentsArchiveFacade{ return br; } + /** + * 婚检修改时应该判断是否有追访记录，可能在孕妇建档时已经生产了追访信息 + * @param userId + */ + public void addTrackDownInfo(Integer userId, ResidentsArchiveModel residentsArchiveModel) { + //新增婚检追访信息，默认进入婚检追访 + TrackDownRecord trackDownRecord = residentsArchiveModel.build(); + //先根据婚检id进行查询 + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setSource(residentsArchiveModel.getId()); + List records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 + TrackDownRecord trackDownRecord1 = records.get(0); + trackDownRecord.setId(trackDownRecord1.getId()); + } else {//根据patient查询是否存在追访信息 + //根据医院id和身份证或手机号进行查询 + downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId()); + if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){ + downRecordQuery.setKey(residentsArchiveModel.getCertificateNum()); + }else if(StringUtils.isNotEmpty(residentsArchiveModel.getPhone())){ + downRecordQuery.setPhone(residentsArchiveModel.getPhone()); + } + records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {//修改 + TrackDownRecord trackDownRecord1 = records.get(0); + trackDownRecord.setId(trackDownRecord1.getId()); + } + } + if("d75d1902-61a5-4a17-a68a-5b8a9826537b".equals(residentsArchiveModel.getMarriageId())){//已婚,自己进入孕妇建档追访 + trackDownRecord.setStatus(1); + trackDownRecord.setTrackType(TrackDownDateEnums.B.getId()); + } + trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + } + /** * 通过ID查看居民建档详情 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 82306ca..d5dc98b 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 @@ -183,26 +183,27 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Override 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()); + //先根据主键id进行查询 + if (StringUtils.isNotEmpty(trackDownRecord.getId())) { + TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId()); + if (trackDownRecord1 != null) { + //流程只能往下流转，不能往上回退 + if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { + //用以前追访的类型和来源id + trackDownRecord.setTrackType(trackDownRecord1.getTrackType()); + trackDownRecord.setSource(trackDownRecord1.getSource()); + } + //由显示修改成不显示，后期数据更新时，不允许将不显示修改成显示。 + if (trackDownRecord1.getStatus() < trackDownRecord.getStatus()) { + trackDownRecord.setStatus(trackDownRecord1.getStatus()); + } + trackDownRecordService.updateTrackDown(trackDownRecord, trackDownRecord1.getId()); + return true; } - //由显示修改成不显示，后期数据更新时，不允许将不显示修改成显示。 - if(trackDownRecord1.getStatus()>trackDownRecord.getStatus()){ - trackDownRecord1.setStatus(trackDownRecord.getStatus()); - } - trackDownRecordService.updateTrackDown(trackDownRecord,trackDownRecord1.getId()); - }else{ - trackDownRecordService.addTrackDown(trackDownRecord); } + trackDownRecordService.addTrackDown(trackDownRecord); return true; - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return false; } @@ -217,11 +218,11 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS trackDown.setParentId(parentId); } //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转 - if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() && + if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() && TrackDownDateEnums.B.getId() == trackDown.getTrackDownDateType() - &&StringUtils.isNotEmpty(trackDown.getParentId())) { + && StringUtils.isNotEmpty(trackDown.getParentId())) { - ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(trackDown.getParentId()); + ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(trackDown.getParentId()); //TODO 需要去验证或者绑定孕妇的建档记录,不然不能进行后续的操作 PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setCardNo(archiveModel.getCertificateNum()); @@ -229,25 +230,25 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery1.setHospitalId(hospitalId); patientsQuery1.setType(1); patientsQuery1.setYn(YnEnums.YES.getId()); - List patientses= patientsService.queryPatient(patientsQuery1); - if(CollectionUtils.isNotEmpty(patientses)){ + List patientses = patientsService.queryPatient(patientsQuery1); + if (CollectionUtils.isNotEmpty(patientses)) { TrackDownRecordQuery trackDownRecordQuery = new TrackDownRecordQuery(); trackDownRecordQuery.setResidentsArchiveId(trackDown.getParentId()); TrackDownRecord trackDownRecord = new TrackDownRecord(); trackDownRecord.setParentId(patientses.get(0).getId()); //修改绑定建档信息的id - trackDownRecordService.findAndMoidify(trackDownRecordQuery,trackDownRecord); - }else { + trackDownRecordService.findAndMoidify(trackDownRecordQuery, trackDownRecord); + } else { return new BaseResponse().setErrorcode(4016).setErrormsg("您还没有孕妇的档案,请去医院建档."); } } //追访列表ID - if(trackDown.getTrackDownRecId()!=null){ + if (trackDown.getTrackDownRecId() != null) { TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId()); - if(trackDownRecord!=null){ + if (trackDownRecord != null) { //当传入的状态和数据库一致时才能进行有效操作 - if(trackDownRecord.getTrackType().intValue()==trackDown.getTrackDownDateType()){ + if (trackDownRecord.getTrackType().intValue() == trackDown.getTrackDownDateType()) { trackDown.setId(null); trackDown.setYn(YnEnums.YES.getId()); trackDown.setCreated(new Date()); @@ -255,17 +256,17 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS trackDown.setOperaterId(userId); trackDown.setModified(new Date()); trackDownService.add(trackDown); - String recordId=trackDown.getTrackDownRecId(); + String recordId = trackDown.getTrackDownRecId(); updateRecordStatus(trackDown, recordId); return RespBuilder.buildSuccess(trackDown.getId()); - }else{ - return RespBuilder.buildErro(ResponseCode.DATA_ERROR,"数据已经被修改请回到列表刷新后再操作！"); + } else { + return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "数据已经被修改请回到列表刷新后再操作！"); } - }else{ - return RespBuilder.buildErro(ResponseCode.DATA_ERROR,"传入的trackDownRecId没有找到数据"); + } else { + return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "传入的trackDownRecId没有找到数据"); } - }else{ - return RespBuilder.buildErro(ResponseCode.DATA_ERROR,"请传入trackDownRecId"); + } else { + return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "请传入trackDownRecId"); } @@ -282,14 +283,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) { TrackDownRecord trackDownRecord = new TrackDownRecord(); - Integer nextId=TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid(); + Integer nextId = TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid(); trackDownRecord.setTrackType(nextId); - trackDownRecordService.updateTrackDown(trackDownRecord,id); + trackDownRecordService.updateTrackDown(trackDownRecord, id); } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) { TrackDownRecord trackDownRecord = new TrackDownRecord(); trackDownRecord.setStatus(0); - trackDownRecordService.updateTrackDown(trackDownRecord,id); + trackDownRecordService.updateTrackDown(trackDownRecord, id); } } -- 1.8.3.1