重庆石柱项目对接接口更新

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

@@ -6,14 +6,14 @@ import java.util.Date;
 
 /**
  * <p>
- * 药品映射表
+ * 检查映射表
  * </p>
  *
- * @author zhaops
- * @since 2020-07-28
+ * @author dsYun
+ * @since 2024-07-22
  */
 @Data
-public class PacsInfo {
+public class TranPacsInfo {
     /**
      * 申请单号
      */
@@ -27,12 +27,12 @@ public class PacsInfo {
     /**
      * 检查套餐项名称
      */
-    private String repName;
+    private String pacsName;
 
     /**
      * 检查结果
      */
-    private String resultsInspection;
+    private String results;
 
     /**
      * 检查类型名称

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

@@ -2,35 +2,26 @@ package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.biz.push.entity.Pacs;
+import com.diagbot.dto.*;
+import com.diagbot.entity.TemplateInfo;
+import com.diagbot.entity.TranPacsInfo;
 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.service.impl.TranPacsInfoServiceImpl;
 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;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /*
  * @Description:对外对接业务处理类
@@ -60,7 +51,7 @@ public class DataPageDockFacade {
     private KlConceptStaticFacade KlConceptStaticFacade;
 
     @Autowired
-    PacsInfoServiceImpl pacsInfoServiceImpl;
+    TranPacsInfoServiceImpl tranPacsInfoServiceImpl;
 
 
     /**
@@ -193,13 +184,21 @@ public class DataPageDockFacade {
         dataPageDockVO.setDiag(getItem(sourceMap.get("诊断")));
         dataPageDockVO.setDrug(getDrug(sourceMap.get("药品")));
         dataPageDockVO.setDiseaseName(getDisease(sourceMap.get("诊断")));
+
+        // 查询检查表
+        List<TranPacsInfo> pacsInfoList = tranPacsInfoServiceImpl.list(new QueryWrapper<TranPacsInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("apply_no", dataPageDockVO.getApplyNo())
+        );
+        dataPageDockVO.setPacsOrder(getPacs(pacsInfoList));
+
     }
 
     private List<Drug> getDrug(String value) {
         Drug drug = new Drug();
         List<Drug> drugList = new ArrayList<>();
         drug.setName(value);
- //       drug.setUniqueName(value);
+        //       drug.setUniqueName(value);
         drugList.add(drug);
         return drugList;
     }
@@ -208,7 +207,7 @@ public class DataPageDockFacade {
         Item item = new Item();
         List<Item> itemList = new ArrayList<>();
         item.setName(value);
-    //    item.setUniqueName(value);
+        //    item.setUniqueName(value);
         itemList.add(item);
         return itemList;
     }
@@ -218,10 +217,26 @@ public class DataPageDockFacade {
         Item item = new Item();
         item.setName(value);
         // item.setUniqueName(value);
- //       item.add(item);
+        //       item.add(item);
         return item;
     }
 
+    private List<Pacs> getPacs(List<TranPacsInfo> pacsInfoList) {
+        Pacs pacs = new Pacs();
+        List<Pacs> pacsList = new ArrayList<>();
+        for (TranPacsInfo pacsInfo : pacsInfoList){
+            if(StringUtil.isNotBlank(pacsInfo.getPacsName())){
+                pacs.setName(pacsInfo.getPacsName());
+                pacs.setUniqueName(pacsInfo.getPacsName());
+            }
+            if(StringUtil.isNotBlank(pacsInfo.getApplyDate())){
+                pacs.setDateValue(pacsInfo.getApplyDate());
+            }
+            pacsList.add(pacs);
+        }
+        return pacsList;
+    }
+
 
     /**
      * @Description:病历推理
@@ -347,30 +362,43 @@ public class DataPageDockFacade {
         return hospitalId;
     }
 
-
-    public RespDTO sendPacsInfos(List<PacsVO> list) {
+    /**
+     * @Description: 保存检查信息
+     * @Author:dsYun
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO<String> sendPacsInfos(PacsVO pacsVO) {
         try {
-            if(list!=null && list.size()>0){
+            if (pacsVO != null) {
                 //循环验证数据有效性
-                for (PacsVO pacsVO:list) {
-                    if(StringUtil.isEmpty(pacsVO.getApplyNo())){
-                        return RespDTO.onError("请输入申请单号!");
-                    }
+                if (StringUtil.isEmpty(pacsVO.getApplyNo())) {
+                    return RespDTO.onError("请输入申请单号!");
+                }
+                //保存检查信息
+                if (pacsVO.getType() == 0) {
+                    TranPacsInfo pacsInfo = new TranPacsInfo();
+                    BeanUtil.copyProperties(pacsVO, pacsInfo);
+                    tranPacsInfoServiceImpl.save(pacsInfo);
+                } else if (pacsVO.getType() == 1) { //更新检查信息删除状态
+                    UpdateWrapper<TranPacsInfo> tranPacsInfo = new UpdateWrapper<>();
+                    tranPacsInfo.eq("apply_no", pacsVO.getApplyNo())
+                            .set("is_deleted", IsDeleteEnum.Y.getKey())
+                            .set("gmt_modified", DateUtil.now());
+                    tranPacsInfoServiceImpl.update(new TranPacsInfo(), tranPacsInfo);
+                } else if (pacsVO.getType() == 2) { //更新修改的检查信息删除状态
+                    UpdateWrapper<TranPacsInfo> tranPacsInfo = new UpdateWrapper<>();
+                    tranPacsInfo.eq("apply_no", pacsVO.getApplyNo())
+                            .set("pacs_name", pacsVO.getPacsName())
+                            .set("results", pacsVO.getResults())
+                            .set("gmt_modified", DateUtil.now());
+                    tranPacsInfoServiceImpl.update(new TranPacsInfo(), tranPacsInfo);
                 }
-
-                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{
+            } else {
                 return RespDTO.onError("未接收到数据!");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             return RespDTO.onError(e.getMessage());
         }
     }

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

@@ -1,16 +0,0 @@
-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/mapper/TranPacsInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.TranPacsInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author dsYun
+ * @since 2024-07-22
+ */
+public interface TranPacsInfoMapper extends BaseMapper<TranPacsInfo> {
+
+}

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

@@ -1,16 +0,0 @@
-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/TranPacsInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.TranPacsInfo;
+
+/**
+ * <p>
+ * 检查信息表 服务类
+ * </p>
+ *
+ * @author dsYun
+ * @since 2024-07-22
+ */
+public interface TranPacsInfoService extends IService<TranPacsInfo> {
+
+}

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

@@ -1,20 +0,0 @@
-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/service/impl/TranPacsInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.TranPacsInfo;
+import com.diagbot.mapper.TranPacsInfoMapper;
+import com.diagbot.service.TranPacsInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author dsYun
+ * @since 2024-07-22
+ */
+@Service
+public class TranPacsInfoServiceImpl extends ServiceImpl<TranPacsInfoMapper, TranPacsInfo> implements TranPacsInfoService {
+
+}

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

@@ -34,7 +34,7 @@ public class DataPageDockVO extends CdssLogBaseVO{
     /**
      * 申请单号
      */
-    private String apply_no;
+    private List<String> applyNo;
     /**
      * 医院编码
      */

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

@@ -3,8 +3,6 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
-
 
 @Getter
 @Setter
@@ -23,12 +21,12 @@ public class PacsVO {
     /**
      * 检查套餐项名称
      */
-    private String repName;
+    private String pacsName;
 
     /**
      * 检查结果
      */
-    private String resultsInspection;
+    private String results;
 
     /**
      * 检查类型名称
@@ -80,22 +78,7 @@ public class PacsVO {
     private String checker;
 
     /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
+     * 操作类型(1：新增，2：删除，3：修改)
      */
-    private String creator;
+    private Integer type;
 }

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

@@ -44,8 +44,8 @@ public class DataPageDockController {
     @PostMapping("/sendPacsInfos")
     @SysLogger("sendPacsInfos")
     @CdssLog("检查信息")
-    public RespDTO sendPacsInfos(@RequestBody List<PacsVO> list){
-        return dataPageDockFacade.sendPacsInfos(list);
+    public RespDTO<String> sendPacsInfos(@RequestBody PacsVO pacsVO){
+        return dataPageDockFacade.sendPacsInfos(pacsVO);
     }