提示信息

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -76,7 +76,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceDetailList.add(detail);
         }
         //插入新的明细记录
-        introduceDetailServiceImpl.saveOrUpdateBatch(introduceDetailList);
+        introduceDetailServiceImpl.saveBatch(introduceDetailList);
         return true;
     }
 
@@ -91,6 +91,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
         introduceDetailQueryWrapper.eq("introduce_id", id);
         introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        //删除提示信息
         this.removeById(id);
         return true;
     }
@@ -106,6 +107,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
         introduceDetailQueryWrapper.in("introduce_id", ids);
         introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        //删除提示信息
         this.removeByIds(Arrays.asList(ids));
         return true;
     }
@@ -124,4 +126,18 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         IPage<IntroduceInfo> introduceInfoIPage = this.page(introducePageVO, introduceInfoQueryWrapper);
         return introduceInfoIPage;
     }
+
+    /**
+     * 带条件查询
+     *
+     * @param map
+     * @return
+     */
+    public List<IntroduceInfo> getByMap(Map<String, Object> map) {
+        QueryWrapper<IntroduceInfo> introduceInfoQueryWrapper = new QueryWrapper<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            introduceInfoQueryWrapper.eq(entry.getKey(), entry.getValue());
+        }
+        return this.list(introduceInfoQueryWrapper);
+    }
 }

icssman-service/src/main/java/com/diagbot/facade/IntroduceMapFacade.java

@@ -32,7 +32,7 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
      * @param introduceMapVO
      * @return
      */
-    public Boolean saveRecord(IntroduceMapVO introduceMapVO) {
+    public Boolean saveIntroduceMap(IntroduceMapVO introduceMapVO) {
         IntroduceInfo introduceInfo = introduceInfoFacade.getById(introduceMapVO.getIntroduceId());
         if (introduceInfo == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未添加");
@@ -45,16 +45,13 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
                 eq("type", introduceMapVO.getType()).
                 eq("introduce_id", introduceMapVO.getIntroduceId());
         IntroduceMap introduceMap = this.getOne(introduceMapQueryWrapper);
-        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
         if (introduceMap == null) {
-            //删除该标签关联的提示信息，插入新的提示信息
+            //删除该标签关联的别的提示信息，插入新的提示信息
+            UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
             introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     eq("question_id", introduceMapVO.getQuestionId()).
-                    eq("type", introduceMapVO.getType()).
-                    set("is_deleted", IsDeleteEnum.Y.getKey()).
-                    set("gmt_modified", new Date()).
-                    set("modifier", UserUtils.getCurrentPrincipleID());
-            this.update(new IntroduceMap(), introduceMapUpdateWrapper);
+                    eq("type", introduceMapVO.getType());
+            this.remove(introduceMapUpdateWrapper);
 
             //插入新的关系
             introduceMap = new IntroduceMap();

icssman-service/src/main/java/com/diagbot/web/DeptVitalController.java

@@ -3,7 +3,6 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DeptVital;
 import com.diagbot.facade.DeptVitalFacade;
 import com.diagbot.vo.DeptVitalVO;
 import io.swagger.annotations.Api;
@@ -14,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * <p>
  * 科室查体对应表 前端控制器

icssman-service/src/main/java/com/diagbot/web/IntroduceDetailController.java

@@ -34,8 +34,8 @@ public class IntroduceDetailController {
             notes = "introduceId: 提示信息id,必填")
     @PostMapping("/getByIntroduceId")
     @SysLogger("getByIntroduceId")
-    public RespDTO<Boolean> getByIntroduceId(@RequestParam Long introduceId) {
+    public RespDTO<List<IntroduceDetail>> getByIntroduceId(@RequestParam Long introduceId) {
         List<IntroduceDetail> data = introduceDetailFacade.getByIntroduceId(introduceId);
         return RespDTO.onSuc(data);
     }
-}
+}

icssman-service/src/main/java/com/diagbot/web/IntroduceInfoController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -86,4 +88,19 @@ public class IntroduceInfoController {
         IPage<IntroduceInfo> infoIPage = introduceInfoFacade.getPageByMap(introducePageVO);
         return RespDTO.onSuc(infoIPage);
     }
+
+    /**
+     * 带条件查询
+     *
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "带条件查询提示信息[by:zhaops]",
+            notes = "map:查询条件（=），key为数据库字段名<br>")
+    @PostMapping("/getByMap")
+    @SysLogger("getByMap")
+    public RespDTO<IntroduceInfo> getByMap(@RequestBody Map<String, Object> map) {
+        List<IntroduceInfo> data = introduceInfoFacade.getByMap(map);
+        return RespDTO.onSuc(data);
+    }
 }

icssman-service/src/main/java/com/diagbot/web/IntroduceMapController.java

@@ -33,10 +33,10 @@ public class IntroduceMapController {
             notes = "questionId: 标签id,必填" +
                     "introduceId: 提示信息id,必填" +
                     "type: 标签类型,必填")
-    @PostMapping("/saveRecord")
-    @SysLogger("saveRecord")
-    public RespDTO<Boolean> saveRecord(@RequestBody IntroduceMapVO introduceMapVO) {
-        Boolean data = introduceMapFacade.saveRecord(introduceMapVO);
+    @PostMapping("/saveIntroduceMap")
+    @SysLogger("saveIntroduceMap")
+    public RespDTO<Boolean> saveIntroduceMap(@RequestBody IntroduceMapVO introduceMapVO) {
+        Boolean data = introduceMapFacade.saveIntroduceMap(introduceMapVO);
         return RespDTO.onSuc(data);
     }
 

icssman-service/src/main/java/com/diagbot/web/VitalOrderController.java

@@ -5,7 +5,6 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.facade.VitalOrderFacade;
-import com.diagbot.vo.DeptVitalVO;
 import com.diagbot.vo.VitalOrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;