浏览代码

病案指标下拉模糊

chengyao 4 年之前
父节点
当前提交
93088b64f1

+ 9 - 18
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -160,7 +160,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @param
      * @return
      */
-    public List<ColumnDTO> getMedQualityControl() {
+    public List<ColumnDTO> getMedQualityControl(BasDeptInfoVO basDeptInfoVO) {
         long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
         //colums
         QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
@@ -172,32 +172,23 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         if (hospitalSet == null || StringUtil.isBlank(hospitalSet.getValue())) {
             return columns;
         }
+       List<String> strings = new ArrayList<>();
 
         //表头生成
         List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
         Integer orderNo = 1;
-        ColumnDTO columnDeptId = new ColumnDTO();
-   /*     columnDeptId.setOrderNo(orderNo);
-        columnDeptId.setFieldName("deptId");
-        columnDeptId.setColumnName("科室编码");
-        columnDeptId.setIsShow(0);
-        columns.add(columnDeptId);
-        orderNo++;
-        ColumnDTO columnDeptName = new ColumnDTO();
-        columnDeptName.setOrderNo(orderNo);
-        columnDeptName.setFieldName("deptName");
-        columnDeptName.setColumnName("科室");
-        columnDeptName.setIsShow(1);
-        columns.add(columnDeptName);
-        orderNo++;*/
         for (String valueStr : columnSet) {
             String[] keyValue = valueStr.split("--");
             if (keyValue != null || keyValue.length > 1) {
+                strings.add(keyValue[1]);
+            }
+        }
+        for (String str : strings) {
+            if(str.contains(basDeptInfoVO.getInputStr())){
                 ColumnDTO columnNum = new ColumnDTO();
                 columnNum.setOrderNo(orderNo);
-                columnNum.setId(Long.valueOf(keyValue[0]));
-                columnNum.setFieldName("entry_" + keyValue[0] + "_name");
-                columnNum.setColumnName(keyValue[1]);
+                columnNum.setColumnName(str);
+                columnNum.setFieldName("entry_" + str + "_name");
                 columnNum.setIsShow(1);
                 columns.add(columnNum);
                 orderNo++;

+ 1 - 1
src/main/java/com/diagbot/vo/BasDeptInfoVO.java

@@ -15,7 +15,7 @@ public class BasDeptInfoVO {
     /**
      * 搜索参数
      */
-    private String inputStr;
+    private String inputStr = "";
 
     @ApiModelProperty(hidden = true)
     private Long hospitalId;

+ 3 - 11
src/main/java/com/diagbot/web/BehospitalInfoController.java

@@ -6,15 +6,7 @@ import com.diagbot.dto.*;
 import com.diagbot.entity.QcCasesRelevanceEntry;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.QcresultInfoFacade;
-import com.diagbot.vo.AnalyzeApiVO;
-import com.diagbot.vo.AnalyzeCdsVO;
-import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.AnalyzeVO;
-import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.ExportQcresultVO;
-import com.diagbot.vo.GetDetailVO;
-import com.diagbot.vo.QcresultVO;
-import com.diagbot.vo.TaskVO;
+import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,8 +74,8 @@ public class BehospitalInfoController {
             notes = "")
     @PostMapping("/getMedQualityCoList")
     @SysLogger("getMedQualityCoList")
-    public RespDTO<List<ColumnDTO>> getMedQualityControl() {
-        List<ColumnDTO> data = behospitalInfoFacade.getMedQualityControl();
+    public RespDTO<List<ColumnDTO>> getMedQualityControl(@RequestBody BasDeptInfoVO basDeptInfoVO) {
+        List<ColumnDTO> data = behospitalInfoFacade.getMedQualityControl(basDeptInfoVO);
         return  RespDTO.onSuc(data);
     }