管理员分页搜索模板接口

icss-service/src/main/java/com/diagbot/facade/TemplateAdminFacade.java

@@ -216,19 +216,30 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         }
         HospitalCodeVo hospitalCodeVo =new HospitalCodeVo();
         hospitalCodeVo.setHospitalCode(templateInfoPageVO.getHospitalCode());
+        hospitalCodeVo.setDeptInfoName("");
+        hospitalCodeVo.setThirdpartyName("");
         RespDTO<List<HospitalDeptInfoAllDTO>> deptInfoDTO = tranServiceClient.getHospitalDeptInfoAll(hospitalCodeVo);
         RespDTOUtil.respNGDeal(deptInfoDTO, deptInfoDTO.msg);
         List<HospitalDeptInfoAllDTO> deptInfo = deptInfoDTO.data;
         Map<Long,HospitalDeptInfoAllDTO> deptMap =deptInfo.stream().collect(Collectors.toMap(HospitalDeptInfoAllDTO::getId,i->i));
         TemplateInfoTypeVO adminVO = new TemplateInfoTypeVO();
-        BeanUtil.copyProperties(templateInfoPageVO,adminVO);
+        adminVO.setName(templateInfoPageVO.getName());
+        adminVO.setSex(templateInfoPageVO.getSex());
+        adminVO.setHospitalDeptId(templateInfoPageVO.getHospitalDeptId());
+        adminVO.setHospitalId(templateInfoPageVO.getHospitalId());
         adminVO.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());
         IPage<TemplateInfoPageDTO> adminTemplate = getTemplatePages(adminVO);
-        adminTemplate.getRecords().forEach(i->{
-            HospitalDeptInfoAllDTO data = deptMap.get(i.getId());
-            i.setConceptDeptName(data.getConceptDeptName());
-            i.setThirdpartyName(data.getName());
-        });
+        if(adminTemplate.getRecords().size()>0){
+            adminTemplate.getRecords().forEach(i->{
+                HospitalDeptInfoAllDTO data = deptMap.get(i.getHospitalDeptId());
+                if(data!=null){
+                    i.setConceptDeptName(data.getConceptDeptName());
+                    i.setThirdpartyName(data.getName());
+                }
+
+            });
+        }
+
         return  adminTemplate;
     }
 
@@ -261,6 +272,7 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
      * @return
      */
     public boolean getadminCheck(HospitalCodeSetVO hospitalCodeSetVO){
+        hospitalCodeSetVO.setShowError(true);
         RespDTO<Boolean> datas = tranServiceClient.getAdminCheckout(hospitalCodeSetVO);
         RespDTOUtil.respNGDeal(datas, datas.msg);
         return  datas.data;

icss-service/src/main/java/com/diagbot/vo/TemplateInfoAdminPageVO.java

@@ -1,8 +1,12 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 /**
  * @author wangfeng
  * @Description:
@@ -10,6 +14,27 @@ import lombok.Setter;
  */
 @Setter
 @Getter
-public class TemplateInfoAdminPageVO extends TemplateInfoPageVO {
+public class TemplateInfoAdminPageVO extends Page {
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+    /**
+     * 医院编码
+     */
+    private Long hospitalId;
+    /**
+     * 部门id
+     */
+    private Long hospitalDeptId;//部门id
+
+    //	@NotBlank(message = "请输入模板类型")
+    private String type;//模板类型
+
+    private List<Integer> sex;//性别
+
+    private String name;//模板名字
+
     private  String hospitalCode;
 }