From 8dda5f6a96c64ec8e6a3617402661794365c12ce Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Sat, 13 Jul 2019 14:10:27 +0800 Subject: [PATCH] =?UTF-8?q?update=E4=BA=A7=E5=90=8E=E5=A4=8D=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 38b4eb5..5b234e1 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 @@ -10,7 +10,6 @@ import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.dao.master.CouponMapper; -import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.springframework.beans.factory.annotation.Autowired; @@ -834,15 +833,15 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS */ public BaseResponse add(Integer userId, TrackDown trackDown) { String hospitalId = autoMatchFacade.getHospitalId(userId); - if (trackDown.getTrackDownDateType() != TrackDownDateEnums.D.getId()) {//不等于产检追访和产后访视时进行数据验证状态 + if (trackDown.getTrackDownDateType() != TrackDownDateEnums.D.getId()) {//&& trackDown.getTrackDownDateType() != TrackDownDateEnums.G.getId()) {//不等于产检追访和产后访视时进行数据验证状态 //追访列表ID if (trackDown.getTrackDownRecId() != null) { TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId()); if (trackDownRecord != null) { //当传入的状态和数据库一致时才能进行有效操作 - if (trackDownRecord.getTrackType().intValue() != trackDown.getTrackDownDateType()) { + /*if (trackDownRecord.getTrackType().intValue() != trackDown.getTrackDownDateType()) { return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "数据已经被修改请回到列表刷新后再操作！"); - } + }*/ if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType() && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex()) && TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {//性别男：特殊处理，流转到下一流程时结束流程 -- 1.8.3.1