From c51da61f72f677a55345a2608b24699c65245d41 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 31 Aug 2022 10:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/pojo/CancerScreeningModel.java   | 2 +-
 .../operate/web/controller/CancerScreeningController.java        | 8 ++++++++
 .../operate/web/controller/CervicalCancerController.java         | 6 ++++++
 .../lyms/platform/operate/web/facade/CancerScreeningFacade.java  | 8 ++++++++
 .../lyms/platform/operate/web/service/CervicalCancerService.java | 2 ++
 .../operate/web/service/impl/CervicalCancerServiceImpl.java      | 9 +++++++++
 6 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
index 745d3d5..6ba77b7 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
@@ -13,7 +13,7 @@ import java.util.Date;
 import java.util.Map;
 
 /**
- * 两癌筛查
+ * 两癌筛查 乳腺癌
  */
 @Document(collection = "lyms_cancer_screen")
 public class CancerScreeningModel extends BaseModel {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java
index 016ec3f..efde957 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java
@@ -86,6 +86,14 @@ public class CancerScreeningController extends BaseController {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return cancerScreenService.list(cancerScreeningRequest, loginState.getId());
     }
+
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.DELETE,value = "/deleteById/{id}")
+    @TokenRequired
+    public BaseResponse deleteById(@PathVariable String id, HttpServletRequest request) {
+        return cancerScreenService.deleteById(id);
+    }
+
     /**
      * 乳腺癌管理列表增加搜索条件：
      * 初始化
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java
index d2ca68f..c91fc1d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java
@@ -45,6 +45,12 @@ public class CervicalCancerController extends BaseController {
         return cervicalCancerService.getPatientInfoByIdCard(param,getUserId(request));
     }
 
+    @RequestMapping(method = RequestMethod.DELETE, value = "/deleteById/{id}")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse deleteById(@PathVariable String id,HttpServletRequest request) {
+        return cervicalCancerService.deleteById(id,getUserId(request));
+    }
 
     /**
      * 保存单个
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
index fb72569..2933db6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
@@ -1425,4 +1425,12 @@ public class CancerScreeningFacade {
             e.printStackTrace();
         }
     }
+
+    public BaseResponse deleteById(String id) {
+        Query query = new Query();
+        Criteria c = Criteria.where("id").is(id);
+        query.addCriteria(c);
+        mongoTemplate.remove(query, CancerScreeningModel.class);
+        return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java
index ca6a69a..c77383d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java
@@ -14,4 +14,6 @@ public interface CervicalCancerService extends IFormReportService<CervicalCancer
     BaseResponse queryCervicalCancerCount(CervicalCancerListRequest param, Integer userId);
 
     BaseResponse queryHpvCount(CervicalCancerListRequest param, Integer userId);
+
+    BaseResponse deleteById(String id, Integer userId);
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
index 2862d61..805e7de 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
@@ -2212,4 +2212,13 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
         result.put("datas",list);
         return new BaseObjectResponse().setData(result).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
+
+    @Override
+    public BaseResponse deleteById(String id, Integer userId) {
+        Query query = new Query();
+        Criteria c = Criteria.where("id").is(id);
+        query.addCriteria(c);
+        mongoTemplate.remove(query, CervicalCancerModel.class);
+        return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
+    }
 }
-- 
1.8.3.1