|
@@ -20,6 +20,7 @@ import com.diagbot.util.ExcelUtils;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.util.SysUserUtils;
|
|
|
+import com.diagbot.vo.BasDeptInfoVO;
|
|
|
import com.diagbot.vo.GetEntryDefectImproveInnerVO;
|
|
|
import com.diagbot.vo.GetEntryDefectImproveVO;
|
|
|
import com.diagbot.vo.GetQcClickInnerPageVO;
|
|
@@ -78,13 +79,17 @@ public class DataAnalysisFacade {
|
|
|
return medClickInfoService.save(medClickInfo);
|
|
|
}
|
|
|
|
|
|
- public List<DeptBaseDTO> getQcClickDeptList() {
|
|
|
+ public List<DeptBaseDTO> getQcClickDeptList(BasDeptInfoVO basDeptInfoVO) {
|
|
|
long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
|
|
|
List<DeptBaseDTO> deptDTO = new ArrayList<>();
|
|
|
List<MedClickInfo> deptList = medClickInfoService.lambdaQuery()
|
|
|
.eq(MedClickInfo::getHospitalId, hospitalId)
|
|
|
.eq(MedClickInfo::getIsDeleted, IsDeleteEnum.N.getKey())
|
|
|
- .select(MedClickInfo::getDeptId, MedClickInfo::getDeptName).groupBy(MedClickInfo::getDeptId).list();
|
|
|
+ .like(MedClickInfo::getDeptName,basDeptInfoVO.getInputStr())
|
|
|
+ .select(MedClickInfo::getDeptId, MedClickInfo::getDeptName)
|
|
|
+ .groupBy(MedClickInfo::getDeptId)
|
|
|
+ .groupBy(MedClickInfo::getDeptName)
|
|
|
+ .list();
|
|
|
if(ListUtil.isNotEmpty(deptList)){
|
|
|
for (MedClickInfo kfc : deptList) {
|
|
|
if(null == kfc){
|