From a6d76a9cc927268ce5744497558f65c116fe0909 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 11:38:27 +0800
Subject: [PATCH] update
---
.../lyms/platform/permission/model/FolviteQuery.java | 11 +++++++++++
.../main/resources/mainOrm/master/FolviteMapper.xml | 8 ++++----
.../resources/mainOrm/master/FolviteReceiveMapper.xml | 19 ++++++++++++++-----
.../lyms/platform/pojo/FolviteReceiveRecordModel.java | 10 ++++++++++
.../operate/web/controller/FolviteController.java | 11 +++++++++++
.../platform/operate/web/service/FolviteService.java | 9 +++++++++
.../operate/web/service/impl/FolviteServiceImpl.java | 14 ++++++++++++--
7 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java
index 309cc76..12bfa13 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java
@@ -43,6 +43,17 @@ public class FolviteQuery extends BaseQuery {
//高危风险因素
private String highRisk;
+ //是否
+ private Integer yn;
+
+
+ public Integer getYn() {
+ return yn;
+ }
+
+ public void setYn(Integer yn) {
+ this.yn = yn;
+ }
public Date getStartReceiveDate() {
return startReceiveDate;
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
index 79ceeb2..8e68716 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -403,11 +403,11 @@ drawTime ) VALUES (
vc_card=#{vcCard,jdbcType=VARCHAR},
-
- hospitalid=#{hospitalid,jdbcType=VARCHAR},
+
+ hospitalid=#{hospitalId,jdbcType=VARCHAR},
-
- receivesum=#{receivesum,jdbcType=INTEGER},
+
+ receivesum=#{receiveSum,jdbcType=INTEGER},
modify=#{modify,jdbcType=TIMESTAMP},
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index 207f573..fc359ea 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -30,7 +30,8 @@ creation_date,
modified,
isconceive,
hospitalid,
-end_pregnancy
+end_pregnancy,
+yn
) VALUES (
#{id,jdbcType=VARCHAR},
#{folviteId,jdbcType=VARCHAR},
@@ -44,8 +45,8 @@ end_pregnancy
#{modified,jdbcType=TIMESTAMP},
#{isconceive,jdbcType=INTEGER},
#{hospitalId,jdbcType=VARCHAR},
-#{endPregnancy,jdbcType=INTEGER}
-)
+#{endPregnancy,jdbcType=INTEGER},
+#{yn,jdbcType=INTEGER})
@@ -67,6 +68,9 @@ end_pregnancy
lyms_folvite_Info f ON p.folvite_id = f.id
1=1
+
+ and yn=#{yn}
+
and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
@@ -101,6 +105,9 @@ end_pregnancy
lyms_folvite_Info f ON p.folvite_id = f.id
1=1
+
+ and yn=#{yn}
+
and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
@@ -183,9 +190,11 @@ end_pregnancy
isconceive=#{isconceive,jdbcType=INTEGER},
- end_pregnancy=#{endPregnancy,jdbcType=INTEGER}
+ end_pregnancy=#{endPregnancy,jdbcType=INTEGER},
+
+
+ yn=#{yn}
-
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java
index cdbfee3..eecf735 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java
@@ -55,6 +55,16 @@ public class FolviteReceiveRecordModel {
//是否完结 0 为完结 1 已完结
private Integer endPregnancy;
+ //是否有效
+ private Integer yn;
+
+ public Integer getYn() {
+ return yn;
+ }
+
+ public void setYn(Integer yn) {
+ this.yn = yn;
+ }
public Integer getEndPregnancy() {
return endPregnancy;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
index 1c034a4..d8a7e49 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.controller;
import com.lyms.platform.common.annotation.TokenRequired;
import com.lyms.platform.common.base.BaseController;
+import com.lyms.platform.common.enums.YnEnums;
import com.lyms.platform.common.result.BaseListResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.common.utils.DateUtil;
@@ -179,6 +180,7 @@ public class FolviteController extends BaseController {
@Param("page") Integer page,
@Param("limit") Integer limit) {
FolviteQuery query = new FolviteQuery();
+ query.setYn(YnEnums.YES.getId());
if (StringUtils.isNotEmpty(queryNo)) {
query.setQueryNo(queryNo);
}
@@ -208,4 +210,13 @@ public class FolviteController extends BaseController {
return response;
}
+ @RequestMapping(value = "deleteReceive/{id}", method = RequestMethod.DELETE)
+ @ResponseBody
+ @TokenRequired
+ public BaseResponse deleteReceive(@PathVariable("id") String id) {
+
+ return folviteService.deleteProvide(id);
+ }
+
+
}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
index 46214d7..9e713ef 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
@@ -60,6 +60,15 @@ public interface FolviteService {
*/
BaseResponse queryOneProvide(String id, Integer userId);
+ /**
+ * 通过id 删除发放记录
+ *
+ * @param id
+ * @return
+ */
+ BaseResponse deleteProvide(String id);
+
+
List queryFolviteList(FolviteQuery folviteQuery);
List queryFolviteReceiveList(FolviteRecordQuery query);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
index d81ab86..608d686 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
@@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.service.impl;
import com.lyms.platform.biz.service.BasicConfigService;
import com.lyms.platform.biz.service.ResidentsArchiveService;
import com.lyms.platform.common.enums.YnEnums;
-import com.lyms.platform.common.result.BaseListResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.common.utils.DateUtil;
import com.lyms.platform.common.utils.StringUtils;
@@ -26,7 +25,6 @@ import com.lyms.platform.pojo.ResidentsArchiveModel;
import com.lyms.platform.query.ResidentsArchiveQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
import java.util.*;
@@ -171,6 +169,9 @@ public class FolviteServiceImpl implements FolviteService {
@Override
public BaseResponse saveProvideFolvite(FolviteReceiveRecordModel receiveRecordModel, Integer userId) {
+ String hospitalId = autoMatchFacade.getHospitalId(userId);
+ receiveRecordModel.setHospitalId(hospitalId);
+ receiveRecordModel.setYn(YnEnums.YES.getId());
if (StringUtils.isNotEmpty(receiveRecordModel.getId())) {
receiveRecordModel.setModified(new Date());
receiveMapper.updaetFolviteReceive(receiveRecordModel);
@@ -224,6 +225,15 @@ public class FolviteServiceImpl implements FolviteService {
}
@Override
+ public BaseResponse deleteProvide(String id) {
+ FolviteReceiveRecordModel receiveRecordModel = new FolviteReceiveRecordModel();
+ receiveRecordModel.setYn(YnEnums.NO.getId());
+ receiveRecordModel.setId(id);
+ receiveMapper.updaetFolviteReceive(receiveRecordModel);
+ return new BaseResponse();
+ }
+
+ @Override
public List queryFolviteList(FolviteQuery folviteQuery) {
if (folviteQuery.getNeed() != null) {
folviteQuery.mysqlBuild(folviteMapper.queryFolviteListCount(folviteQuery));
--
1.8.3.1