重庆石柱项目获取检查接口上传

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -142,6 +142,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/klRule/getRulePage").permitAll()
                 .antMatchers("/klRule/getRuleDetail").permitAll()
                 .antMatchers("/dataPage/docking/getDataService").permitAll()
+                .antMatchers("/dataPage/docking/sendPacsInfos").permitAll()
                 .antMatchers("/dataPage/docking/getStaticKnowledge").permitAll()
                 .antMatchers("/dataPage/docking/getDataEngine").permitAll()
                 .antMatchers("/dataPage/docking/addUserAndRole").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -184,6 +184,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/klRule/getRulePage", request)
                 || matchers("/klRule/getRuleDetail", request)
                 || matchers("/dataPage/docking/getDataService", request)
+                || matchers("/dataPage/docking/sendPacsInfos", request)
                 || matchers("/dataPage/docking/getStaticKnowledge", request)
                 || matchers("/dataPage/docking/getDataEngine", request)
                 || matchers("/dataPage/docking/addUserAndRole", request)

src/main/java/com/diagbot/entity/PacsInfo.java

@@ -0,0 +1,116 @@
+package com.diagbot.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 药品映射表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2020-07-28
+ */
+@Data
+public class PacsInfo {
+    /**
+     * 申请单号
+     */
+    private String applyNo;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 检查套餐项名称
+     */
+    private String repName;
+
+    /**
+     * 检查结果
+     */
+    private String resultsInspection;
+
+    /**
+     * 检查类型名称
+     */
+    private String repTypeName;
+
+    /**
+     * 报告发布时间
+     */
+    private String repDate;
+
+    /**
+     * 报告检查时间
+     */
+    private String checkDate;
+
+    /**
+     * 申请时间
+     */
+    private String applyDate;
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 开单科室代码
+     */
+    private String deptId;
+
+    /**
+     * 开单科室名称
+     */
+    private String deptName;
+
+    /**
+     * 报告单状态
+     */
+    private String registerFlag;
+
+    /**
+     * 报告医生
+     */
+    private String reportDoctor;
+
+    /**
+     * 报告审核医生
+     */
+    private String checker;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人，0表示无创建人值
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -2,22 +2,26 @@ package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.CdssApplication;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushPlanDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.PacsInfo;
 import com.diagbot.entity.SysUser;
 import com.diagbot.entity.TranDatadockingLog;
 import com.diagbot.entity.TranHospitalRelation;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.PacsInfoService;
+import com.diagbot.service.impl.PacsInfoServiceImpl;
 import com.diagbot.util.*;
 import com.diagbot.vo.*;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.stereotype.Component;
@@ -55,6 +59,10 @@ public class DataPageDockFacade {
     @Autowired
     private KlConceptStaticFacade KlConceptStaticFacade;
 
+    @Autowired
+    PacsInfoServiceImpl pacsInfoServiceImpl;
+
+
     /**
      * @Description:静态知识开单合理性
      * @Author:liuqq
@@ -331,4 +339,32 @@ public class DataPageDockFacade {
         return hospitalId;
     }
 
+
+    public RespDTO sendPacsInfos(List<PacsVO> list) {
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (PacsVO pacsVO:list) {
+                    if(StringUtil.isEmpty(pacsVO.getApplyNo())){
+                        return RespDTO.onError("请输入申请单号!");
+                    }
+                }
+
+                List<PacsInfo> pacsInfoList= Lists.newArrayList();
+                list.stream().forEach(s->{
+                    PacsInfo pacsInfo = new PacsInfo();
+                    BeanUtil.copyProperties(s,pacsInfo);
+                    pacsInfoList.add(pacsInfo);
+                });
+                pacsInfoServiceImpl.saveBatch(pacsInfoList);
+
+                return RespDTO.onSuc("操作正常！");
+            }else{
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+
 }

src/main/java/com/diagbot/mapper/PacsInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.PacsInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-07-27
+ */
+public interface PacsInfoMapper extends BaseMapper<PacsInfo> {
+
+}

src/main/java/com/diagbot/service/PacsInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.PacsInfo;
+
+/**
+ * <p>
+ * 医院关联表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-10-09
+ */
+public interface PacsInfoService extends IService<PacsInfo> {
+
+}

src/main/java/com/diagbot/service/impl/PacsInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.PacsInfo;
+import com.diagbot.mapper.PacsInfoMapper;
+import com.diagbot.service.PacsInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-07-27
+ */
+@Service
+public class PacsInfoServiceImpl  extends ServiceImpl<PacsInfoMapper, PacsInfo> implements PacsInfoService {
+
+}

src/main/java/com/diagbot/vo/DataPageDockVO.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
@@ -27,10 +26,15 @@ public class DataPageDockVO extends CdssLogBaseVO{
 
     @NotNull(message = "请输入方案编码")
     private String planCode;//方案编码，用于控制哪些展示项
+
     /**
      * 医院ID
      */
     private Long hospitalId;
+    /**
+     * 申请单号
+     */
+    private String apply_no;
     /**
      * 医院编码
      */

src/main/java/com/diagbot/vo/PacsVO.java

@@ -0,0 +1,101 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+
+@Getter
+@Setter
+public class PacsVO {
+
+    /**
+     * 申请单号
+     */
+    private String applyNo;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 检查套餐项名称
+     */
+    private String repName;
+
+    /**
+     * 检查结果
+     */
+    private String resultsInspection;
+
+    /**
+     * 检查类型名称
+     */
+    private String repTypeName;
+
+    /**
+     * 报告发布时间
+     */
+    private String repDate;
+
+    /**
+     * 报告检查时间
+     */
+    private String checkDate;
+
+    /**
+     * 申请时间
+     */
+    private String applyDate;
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 开单科室代码
+     */
+    private String deptId;
+
+    /**
+     * 开单科室名称
+     */
+    private String deptName;
+
+    /**
+     * 报告单状态
+     */
+    private String registerFlag;
+
+    /**
+     * 报告医生
+     */
+    private String reportDoctor;
+
+    /**
+     * 报告审核医生
+     */
+    private String checker;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+}

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

@@ -11,9 +11,9 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description: 页面推送模式-对接API 控制器
@@ -31,7 +31,7 @@ public class DataPageDockController {
     @Autowired
     private UserDockFacade userDockFacade;
 
-    @ApiOperation(value = "页面推送模式-推理API[QQ]",
+    @ApiOperation(value = "页面推送模式-推理API（重庆石柱专用）[dsYun]",
             notes = "")
     @PostMapping("/getDataService")
     @SysLogger("getDataService")
@@ -40,6 +40,15 @@ public class DataPageDockController {
         return dataPageDockFacade.getDataService(dataPageDockVO, xmlText);
     }
 
+    @ApiOperation(value = "获取检查信息（重庆石柱专用）")
+    @PostMapping("/sendPacsInfos")
+    @SysLogger("sendPacsInfos")
+    @CdssLog("检查信息")
+    public RespDTO sendPacsInfos(@RequestBody List<PacsVO> list){
+        return dataPageDockFacade.sendPacsInfos(list);
+    }
+
+
     @ApiOperation(value = "页面推送模式-静态知识API[QQ]",
             notes = "")
     @PostMapping("/getStaticKnowledge")