Merge remote-tracking branch 'origin/dev/20200513end_1.2.0' into dev/20200513end_1.2.0

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -17,7 +17,12 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -431,4 +436,20 @@ public class ConsoleByDeptFacade {
             return null;
         }
     }
+
+    /**
+     * 获取关联科室
+     *
+     * @param
+     * @return
+     */
+    public List<DeptBaseDTO> getDept() {
+        FilterByDeptVO filterByDeptVO = new FilterByDeptVO();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterByDeptVO.setHospitalId(hospitalId);
+        filterByDeptVO.setUserId(Long.valueOf(userId));
+        List<DeptBaseDTO> deptList = basDeptInfoFacade.getDeptByUser(filterByDeptVO);
+        return deptList;
+    }
 }

src/main/java/com/diagbot/web/ConsoleByDeptController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DeptBaseDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConsoleByDeptFacade;
 import com.diagbot.vo.FilterByDeptVO;
@@ -12,6 +13,7 @@ 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;
 import java.util.Map;
 
 /**
@@ -62,4 +64,13 @@ public class ConsoleByDeptController {
         Map<String, Object> data = consoleByDeptFacade.entryCountGroupByEntryAndDept(filterByDeptVO);
         return RespDTO.onSuc(data);
     }
-}
+
+    @ApiOperation(value = "用户关联科室[by:zhaops]",
+            notes = "")
+    @PostMapping("/getDept")
+    @SysLogger("getDept")
+    public RespDTO<List<DeptBaseDTO>> getDept() {
+        List<DeptBaseDTO> data = consoleByDeptFacade.getDept();
+        return RespDTO.onSuc(data);
+    }
+}