查体模板

icssman-service/src/main/java/com/diagbot/dto/DeptVitalDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.QuestionInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/29 14:28
+ */
+@Getter
+@Setter
+public class DeptVitalDTO {
+    String deptId;
+    String deptName;
+    List<QuestionInfo> vitals;
+}

icssman-service/src/main/java/com/diagbot/dto/VitalInfoDTO.java

@@ -0,0 +1,17 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/29 15:09
+ */
+@Getter
+@Setter
+public class VitalInfoDTO{
+    private String TagName;
+    private Long id;
+    private Integer orderNo;
+}

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

@@ -13,6 +13,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
+import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -87,4 +88,31 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
         this.remove(deptVitalQueryWrapper);
         return true;
     }
+
+    /**
+     * 删除科室查体模板标签-全删除
+     * @param deptId
+     * @return
+     */
+    public Boolean delAllDeptVitalList(Long deptId) {
+        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
+        deptVitalQueryWrapper.eq("dept_id", deptId);
+        this.remove(deptVitalQueryWrapper);
+        return true;
+    }
+
+    /**
+     * 根据部门获取查体模板
+     * @param deptId
+     * @return
+     */
+    public List<QuestionInfo> getVitalsByDeptId(Long deptId) {
+        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
+        deptVitalQueryWrapper.eq("dept_id", deptId).
+                eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
+        Map<Long, DeptVital> vitalIdsMap = EntityUtil.makeEntityMap(deptVitalList, "vitalId");
+        List<QuestionInfo> vitalList = Lists.newArrayList(questionInfoFacade.listByIds(vitalIdsMap.keySet()));
+        return vitalList;
+    }
 }

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

@@ -1,16 +1,22 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.VitalInfoDTO;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.service.impl.VitalOrderServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VitalOrderVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -22,6 +28,8 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
 
     @Autowired
     VitalOrderServiceImpl vitalOrderServiceImpl;
+    @Autowired
+    QuestionInfoFacade questionInfoFacade;
 
     public Boolean saveAll(List<VitalOrderVO> vitalOrderVOList) {
         //先删除现有排序
@@ -43,10 +51,52 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
 
     /**
      * 获取所有查体排序关系
+     *
+     * @return
+     */
+    public List<VitalInfoDTO> getAll() {
+        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
+        vitalOrderQueryWrapper.orderByAsc("order_no");
+        List<VitalOrder> vitalOrderLis = this.list(vitalOrderQueryWrapper);
+        Map<Long, VitalOrder> orderMap = EntityUtil.makeEntityMap(vitalOrderLis, "id");
+        List<QuestionInfo> vitals = Lists.newArrayList(questionInfoFacade.listByIds(orderMap.keySet()));
+        Map<Long, QuestionInfo> vitalMap = EntityUtil.makeEntityMap(vitals, "id");
+        List<VitalInfoDTO> vitalInfoDTOList = Lists.newArrayList();
+        for (Map.Entry<Long, VitalOrder> entry : orderMap.entrySet()) {
+            if (vitalMap.get(entry.getKey()) != null) {
+                VitalInfoDTO vitalInfoDTO = new VitalInfoDTO();
+                vitalInfoDTO.setId(vitalMap.get(entry.getKey()).getId());
+                vitalInfoDTO.setTagName(vitalMap.get(entry.getKey()).getTagName());
+                vitalInfoDTO.setOrderNo(entry.getValue().getOrderNo());
+                vitalInfoDTOList.add(vitalInfoDTO);
+            }
+        }
+        return vitalInfoDTOList;
+    }
+
+    /**
+     * 删除排序
+     *
+     * @param vitalId
+     * @return
+     */
+    public Boolean deleteVitalOrder(Long vitalId) {
+        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
+        vitalOrderQueryWrapper.eq("vital_id", vitalId);
+        this.remove(vitalOrderQueryWrapper);
+        return true;
+    }
+
+    /**
+     * 删除排序-批量
+     *
+     * @param vitalIds
      * @return
      */
-    public List<VitalOrder> getAll() {
+    public Boolean deleteVitalOrders(Long[] vitalIds) {
         QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        return this.list(vitalOrderQueryWrapper);
+        vitalOrderQueryWrapper.in("vital_id", vitalIds);
+        this.remove(vitalOrderQueryWrapper);
+        return true;
     }
 }

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

@@ -2,7 +2,9 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DeptVitalDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.DeptVitalFacade;
 import com.diagbot.vo.DeptVitalVO;
 import io.swagger.annotations.Api;
@@ -11,8 +13,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室查体对应表 前端控制器
@@ -39,7 +44,7 @@ public class DeptVitalController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "删除模板标签[by:zhaops]",
+    @ApiOperation(value = "删除模板标签-部分删除[by:zhaops]",
             notes = "deptId:科室ID，必填<br>" +
                     "vitalIds:查体标签ids，必填<br>")
     @PostMapping("/delDeptVitalList")
@@ -48,4 +53,22 @@ public class DeptVitalController {
         Boolean data = deptVitalFacade.delDeptVitalList(deptVitalVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "删除模板标签-全删除[by:zhaops]",
+            notes = "deptId:科室ID，必填<br>")
+    @PostMapping("/delAllDeptVitalList")
+    @SysLogger("delAllDeptVitalList")
+    public RespDTO<Boolean> delAllDeptVitalList(@RequestParam("deptId") Long deptId) {
+        Boolean data = deptVitalFacade.delAllDeptVitalList(deptId);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "根据科室ID获取查体模板[by:zhaops]",
+            notes = "deptId:科室ID，必填<br>")
+    @PostMapping("/getVitalsByDeptId")
+    @SysLogger("getVitalsByDeptId")
+    public RespDTO<List<QuestionInfo>> getVitalsByDeptId(@RequestParam("deptId") Long deptId) {
+        List<QuestionInfo> data = deptVitalFacade.getVitalsByDeptId(deptId);
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VitalInfoDTO;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.facade.VitalOrderFacade;
 import com.diagbot.vo.VitalOrderVO;
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -45,9 +47,26 @@ public class VitalOrderController {
     @ApiOperation(value = "获取查体排序-全部[by:zhaops]")
     @PostMapping("/getAll")
     @SysLogger("getAll")
-    public RespDTO<List<VitalOrder>> getAll() {
-        List<VitalOrder> data = vitalOrderFacade.getAll();
+    public RespDTO<List<VitalInfoDTO>> getAll() {
+        List<VitalInfoDTO> data = vitalOrderFacade.getAll();
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "删除查体排序-单条[by:zhaops]",
+            notes = "vitalId:查体标签ID，必填<br>")
+    @PostMapping("/deleteVitalOrder")
+    @SysLogger("deleteVitalOrder")
+    public RespDTO<Boolean> deleteVitalOrder(@RequestParam("vitalId") Long vitalId) {
+        Boolean data = vitalOrderFacade.deleteVitalOrder(vitalId);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "删除查体排序-批量[by:zhaops]",
+            notes = "vitalIds:查体标签ID，必填<br>")
+    @PostMapping("/deleteVitalOrders")
+    @SysLogger("deleteVitalOrders")
+    public RespDTO<Boolean> deleteVitalOrders(@RequestParam("vitalIds") Long[] vitalIds) {
+        Boolean data = vitalOrderFacade.deleteVitalOrders(vitalIds);
+        return RespDTO.onSuc(data);
+    }
 }