增加归档接口-检验检查结果对接接口

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

@@ -157,6 +157,10 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
+                .antMatchers("/qc/data/deleteFlag").permitAll()
+                .antMatchers("/qc/data/placeFile").permitAll()
+                .antMatchers("/qc/data/sendLisResults").permitAll()
+                .antMatchers("/qc/data/sendPacsResults").permitAll()
                 .antMatchers("/qc/data/getColumnZhAndCh").permitAll()
                 .antMatchers("/qc/data/analyseRec").permitAll()
                 .antMatchers("/qc/data/hisDataDeal").permitAll()

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

@@ -201,6 +201,10 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendHomeDiagnose", request)
                 || matchers("/qc/data/sendHomeOperation", request)
                 || matchers("/qc/data/sendCrisis", request)
+                || matchers("/qc/data/deleteFlag", request)
+                || matchers("/qc/data/placeFile", request)
+                || matchers("/qc/data/sendLisResults", request)
+                || matchers("/qc/data/sendPacsResults", request)
                 || matchers("/qc/data/getColumnZhAndCh", request)
                 || matchers("/qc/data/analyseRec", request)
                 || matchers("/qc/data/hisDataDeal", request)

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -23,7 +23,7 @@ public class MedLisResult implements Serializable {
     /**
      * 医院ID
      */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 住院病人ID
@@ -83,12 +83,12 @@ public class MedLisResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -107,11 +107,11 @@ public class MedLisResult implements Serializable {
     public void setRepNo(String repNo) {
         this.repNo = repNo;
     }
-    public Integer getHospitalId() {
+    public Long getHospitalId() {
         return hospitalId;
     }
 
-    public void setHospitalId(Integer hospitalId) {
+    public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
     public String getBehospitalCode() {
@@ -191,18 +191,18 @@ public class MedLisResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -23,7 +23,7 @@ public class MedPacsResult implements Serializable {
     /**
      * 医院ID
      */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 住院病人ID
@@ -88,12 +88,12 @@ public class MedPacsResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -112,11 +112,11 @@ public class MedPacsResult implements Serializable {
     public void setRepNo(String repNo) {
         this.repNo = repNo;
     }
-    public Integer getHospitalId() {
+    public Long getHospitalId() {
         return hospitalId;
     }
 
-    public void setHospitalId(Integer hospitalId) {
+    public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
     public String getBehospitalCode() {
@@ -203,18 +203,18 @@ public class MedPacsResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -2,6 +2,7 @@ package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
 import com.diagbot.entity.BehospitalInfo;
@@ -16,6 +17,8 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.APlaceFileVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -170,4 +173,54 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
         return qcTypeId;
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new BehospitalInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"","删除成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+
+    public RespDTO placeFileFlag(APlaceFileVO aPlaceFileVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isBlank(aPlaceFileVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aPlaceFileVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else{
+                UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("behospital_code", aPlaceFileVO.getBehospitalCode())
+                        .eq("hospital_id", aPlaceFileVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_placefile","1")
+                        .set("placefile_date",aPlaceFileVO.getPlaceFileDate().isEmpty()?DateUtil.formatDateTime(DateUtil.now()):DateUtil.parseDateTime(aPlaceFileVO.getPlaceFileDate()))
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new BehospitalInfo(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-归档",JSON.toJSONString(aPlaceFileVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java

@@ -2,14 +2,17 @@ package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ADoctorAdviceDTO;
 import com.diagbot.entity.DoctorAdvice;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.ADoctorAdviceVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -114,4 +117,32 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
             aMedAbnormalInfoFacade.saveAbnormalInfo("医嘱信息", JSON.toJSONString(doctorAdviceList),"",e.getMessage());
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getDoctorAdviceId())) {
+                return RespDTO.onError("请输入病人医嘱编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("doctor_advice_id", aDeleteFlagVO.getDoctorAdviceId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new DoctorAdvice(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java

@@ -2,12 +2,17 @@ package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeDiagnoseDTO;
 import com.diagbot.entity.HomeDiagnoseInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AHomeDiagnoseVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +96,32 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
             aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-医嘱", JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("出院诊断未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("出院诊断未输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getDiagnoseOrderNo())){
+                return RespDTO.onError("出院诊断未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("diagnose_order_no", aDeleteFlagVO.getDiagnoseOrderNo())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new HomeDiagnoseInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java

@@ -2,12 +2,17 @@ package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeOperationDTO;
 import com.diagbot.entity.HomeOperationInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AHomeOperationVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,4 +98,32 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
             aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术", JSON.toJSONString(homeOperationList),"",e.getMessage());
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("住院手术未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("住院手术未输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getOperationOrderNo())){
+                return RespDTO.onError("住院手术未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new HomeOperationInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -2,21 +2,17 @@ package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
 import com.diagbot.entity.HomePage;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.service.impl.HomePageServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ReadProperties;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.data.AHomeDiagnoseVO;
-import com.diagbot.vo.data.AHomeOperationVO;
-import com.diagbot.vo.data.AHomePageIngVO;
-import com.diagbot.vo.data.AHomePageVO;
+import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -269,4 +265,31 @@ public class AHomePageFacade extends HomePageServiceImpl{
             aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", JSON.toJSONString(homePageList),"",e.getMessage());
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("请输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+                Boolean flag=update(new HomePage(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

src/main/java/com/diagbot/facade/data/AMedLisResultFacade.java

@@ -0,0 +1,128 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedLisResult;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.MedLisResultServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.AMedLisResultVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AMedLisResultFacade extends MedLisResultServiceImpl {
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    private TZDBConn tzDBConn = new TZDBConn();
+
+    /**
+     * 同步前一天
+     */
+    public void executeMedLisResult() {
+        //String sql="select * from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
+        //同步前一天的数据
+        String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
+        List<MedLisResult> medLisResultList= tzDBConn.getLisResult(sql);
+        execute(medLisResultList);
+    }
+
+    public RespDTO<List<AMedLisResultVO>> executeMedLisResult(List<AMedLisResultVO> list) {
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AMedLisResultVO aMedLisResultVO:list) {
+                    if(StringUtil.isEmpty(aMedLisResultVO.getRepNo())){
+                        return RespDTO.onError("请输入报告单号!");
+                    }else if(aMedLisResultVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(aMedLisResultVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
+                }
+
+                List<MedLisResult> medLisResultList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedLisResult medLisResult=new MedLisResult();
+                    BeanUtil.copyProperties(s,medLisResult);
+                    medLisResultList.add(medLisResult);
+                });
+                execute(medLisResultList);
+
+                return RespDTO.onSuc(list);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+
+    public void execute(List<MedLisResult> medLisResultList){
+        try {
+            List<MedLisResult> addE = Lists.newLinkedList();
+            List<MedLisResult> updateE = Lists.newLinkedList();
+            if (medLisResultList != null && medLisResultList.size() > 0) {
+                medLisResultList.stream().forEach(s -> {
+                    MedLisResult medLisResult = this.getOne(new QueryWrapper<MedLisResult>()
+                            .eq("rep_no", s.getRepNo())
+                            .eq("hospital_id", s.getHospitalId()), false);
+                    if (medLisResult != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                this.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                this.baseMapper.updateBatchByKey(updateE);
+            }
+            //aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(medLisResultList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(medLisResultList),"",e.getMessage());
+        }
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getReptNo())){
+                return RespDTO.onError("请输入报告单号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedLisResult> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getReptNo())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedLisResult(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("检验-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+}

src/main/java/com/diagbot/facade/data/AMedPacsResultFacade.java

@@ -0,0 +1,128 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedPacsResult;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.MedPacsResultServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.AMedPacsResultVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    private TZDBConn tzDBConn = new TZDBConn();
+
+    /**
+     * 同步前一天
+     */
+    public void executeMedPacsResult() {
+        //String sql="select * from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
+        //同步前一天的数据
+        String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
+        List<MedPacsResult> medPacsResultList= tzDBConn.getPacsResult(sql);
+        execute(medPacsResultList);
+    }
+
+    public RespDTO<List<AMedPacsResultVO>> executeMedPacsResult(List<AMedPacsResultVO> list) {
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AMedPacsResultVO aMedPacsResultVO:list) {
+                    if(StringUtil.isEmpty(aMedPacsResultVO.getRepNo())){
+                        return RespDTO.onError("请输入报告单号!");
+                    }else if(aMedPacsResultVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(aMedPacsResultVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
+                }
+
+                List<MedPacsResult> medPacsResultList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedPacsResult medPacsResult=new MedPacsResult();
+                    BeanUtil.copyProperties(s,medPacsResult);
+                    medPacsResultList.add(medPacsResult);
+                });
+                execute(medPacsResultList);
+
+                return RespDTO.onSuc(list);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+
+    public void execute(List<MedPacsResult> medPacsResultList){
+        try {
+            List<MedPacsResult> addE = Lists.newLinkedList();
+            List<MedPacsResult> updateE = Lists.newLinkedList();
+            if (medPacsResultList != null && medPacsResultList.size() > 0) {
+                medPacsResultList.stream().forEach(s -> {
+                    MedPacsResult medPacsResult = this.getOne(new QueryWrapper<MedPacsResult>()
+                            .eq("rep_no", s.getRepNo())
+                            .eq("hospital_id", s.getHospitalId()), false);
+                    if (medPacsResult != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                this.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                this.baseMapper.updateBatchByKey(updateE);
+            }
+            //aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"",e.getMessage());
+        }
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getReptNo())){
+                return RespDTO.onError("请输入报告单号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedPacsResult> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getReptNo())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedPacsResult(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("检查-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+}

src/main/java/com/diagbot/facade/data/AMedicalRecordContentFacade.java

@@ -2,12 +2,17 @@ package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordContentDTO;
 import com.diagbot.entity.MedicalRecordContent;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedicalRecordContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,4 +89,29 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容", JSON.toJSONString(mrContentList),"",e.getMessage());
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if (StringUtil.isEmpty(aDeleteFlagVO.getRecId())) {
+                return RespDTO.onError("请输入文书序号!");
+            } else if (aDeleteFlagVO.getHospitalId() == null) {
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedicalRecordContent> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedicalRecordContent(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -1,6 +1,8 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
@@ -407,4 +409,42 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         return modeId;
     }
 
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if (StringUtil.isEmpty(aDeleteFlagVO.getRecId())) {
+                return RespDTO.onError("请输入文书序号!");
+            } else if (aDeleteFlagVO.getHospitalId() == null) {
+                return RespDTO.onError("请输入医院编码!");
+            } else if (StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<MedicalRecord> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedicalRecord(),updateWrapper);
+                if(flag){
+                    UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();
+                    updateWrapperContent.eq("rec_id", aDeleteFlagVO.getRecId())
+                            .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                            .eq("is_deleted",IsDeleteEnum.N)
+                            .set("is_deleted",IsDeleteEnum.Y)
+                            .set("gmt_modified", DateUtil.now());
+
+                    Boolean flagContent=aMedicalRecordContentFacade.update(new MedicalRecordContent(),updateWrapperContent);
+                    //aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flagContent)),"操作成功!");
+                }
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书-删除", JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

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

@@ -17,4 +17,6 @@ import java.util.List;
  */
 public interface MedLisResultMapper extends BaseMapper<MedLisResult> {
     List<MedLisResultDTO> getMedLisResults(BehospitalInfo behospitalInfo);
+
+    void updateBatchByKey(List<MedLisResult> list);
 }

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

@@ -16,4 +16,6 @@ import java.util.List;
  */
 public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
     public List<MedPacsResult> getMedPacsResults(BehospitalInfo behospitalInfo);
+
+    void updateBatchByKey(List<MedPacsResult> list);
 }

src/main/java/com/diagbot/util/TZDBConn.java

@@ -1,28 +1,12 @@
 package com.diagbot.util;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
+import com.diagbot.entity.*;
+import com.google.common.collect.Lists;
+
+import java.sql.*;
 import java.util.List;
 import java.util.ResourceBundle;
 
-import javax.print.DocFlavor.STRING;
-
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.DoctorAdvice;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.entity.HomeOperationInfo;
-import com.diagbot.entity.HomePage;
-import com.diagbot.entity.MedRecordType;
-import com.diagbot.entity.MedicalRecord;
-import com.diagbot.entity.MedicalRecordContent;
-import com.google.common.collect.Lists;
-
 public class TZDBConn {
 	private static final String DRIVER = getValue("jdbc.driverClassName");
     private static final String URL = getValue("jdbc.url");
@@ -699,5 +683,75 @@ public class TZDBConn {
 
 		return mrTypeList;
 	}
+
+	/**
+	 * 从视图中获取化验
+	 * @return
+	 */
+	public List<MedLisResult> getLisResult(String sql){
+		List<MedLisResult> medLisResultList=Lists.newLinkedList();
+		try {
+			TZDBConn dbconn=new TZDBConn();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				MedLisResult medLisResult=new MedLisResult();
+				medLisResult.setRepNo("");
+				medLisResult.setHospitalId(HOSPITAL_ID);
+				medLisResult.setBehospitalCode("");
+				medLisResult.setItemCode("");
+				medLisResult.setItemName("");
+				medLisResult.setResult("");
+				medLisResult.setReferenceMin("");
+				medLisResult.setReferenceMax("");
+				medLisResult.setUnit("");
+				medLisResult.setAbnormal("");
+				medLisResult.setColor("");
+
+				medLisResultList.add(medLisResult);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+
+		return medLisResultList;
+	}
+
+
+	/**
+	 * 从视图中获取化验
+	 * @return
+	 */
+	public List<MedPacsResult> getPacsResult(String sql){
+		List<MedPacsResult> medPacsResultList=Lists.newLinkedList();
+		try {
+			TZDBConn dbconn=new TZDBConn();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				MedPacsResult medPacsResult=new MedPacsResult();
+				medPacsResult.setRepNo("");
+				medPacsResult.setHospitalId(HOSPITAL_ID);
+				medPacsResult.setBehospitalCode("");
+				medPacsResult.setReptName("");
+				medPacsResult.setPart("");
+				medPacsResult.setClinicSight("");
+				medPacsResult.setReptDiag("");
+				medPacsResult.setRemark("");
+				medPacsResult.setClinicDiag("");
+				medPacsResult.setApplyDoctor("");
+				medPacsResult.setCheckerDoctor("");
+				medPacsResult.setReportDoctor("");
+				medPacsResult.setDeptName("");
+
+				medPacsResultList.add(medPacsResult);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return medPacsResultList;
+	}
 	
 }

src/main/java/com/diagbot/vo/data/ADeleteFlagVO.java

@@ -0,0 +1,32 @@
+package com.diagbot.vo.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ADeleteFlagVO {
+
+    private String modeType;
+
+    private Long hospitalId;
+
+    private String behospitalCode;
+
+    private String doctorAdviceId;
+
+    private String homePageId;
+
+    private String diagnoseId;
+
+    private String operationId;
+
+    private String operationOrderNo;
+
+    private String diagnoseOrderNo;
+
+    private String recId;
+
+    private String reptNo;
+
+}

src/main/java/com/diagbot/vo/data/AMedLisResultVO.java

@@ -0,0 +1,64 @@
+package com.diagbot.vo.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AMedLisResultVO {
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告代码
+     */
+    private String itemCode;
+
+    /**
+     * 报告名称
+     */
+    private String itemName;
+
+    /**
+     * 检验结果
+     */
+    private String result;
+
+    /**
+     * 最小参考值
+     */
+    private String referenceMin;
+
+    /**
+     * 最大参考值
+     */
+    private String referenceMax;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 异常标志
+     */
+    private String abnormal;
+
+    /**
+     * 异常颜色
+     */
+    private String color;
+}

src/main/java/com/diagbot/vo/data/AMedPacsResultVO.java

@@ -0,0 +1,73 @@
+package com.diagbot.vo.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AMedPacsResultVO {
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告名称
+     */
+    private String reptName;
+
+    /**
+     * 检查部位
+     */
+    private String part;
+
+    /**
+     * 检查所见
+     */
+    private String clinicSight;
+
+    /**
+     * 检查结果诊断
+     */
+    private String reptDiag;
+
+    /**
+     * 观察记录
+     */
+    private String remark;
+
+    /**
+     * 临床诊断
+     */
+    private String clinicDiag;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 审核医生
+     */
+    private String checkerDoctor;
+
+    /**
+     * 报告医生
+     */
+    private String reportDoctor;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+}

src/main/java/com/diagbot/vo/data/APlaceFileVO.java

@@ -0,0 +1,12 @@
+package com.diagbot.vo.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class APlaceFileVO {
+    private String behospitalCode;//病人住院ID
+    private Long hospitalId;//医院编码
+    private String placeFileDate;//归档时间
+}

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

@@ -20,42 +20,32 @@ import java.util.Map;
 @RequestMapping("/qc/data")
 @Api(value = "对接接口API", tags = { "对接接口API" })
 public class DataController {
-
     @Autowired
     private ABasDoctorInfoFacade aBasDoctorInfoFacade;
-
     @Autowired
     private ABasDeptInfoFacade aBasDeptInfoFacade;
-
     @Autowired
     private AMedRecordTypeFacade aMedRecordTypeFacade;
-
     @Autowired
     private ABehospitalInfoFacade aBehospitalInfoFacade;
-
     @Autowired
     private ADoctorAdviceFacade aDoctorAdviceFacade;
-
     @Autowired
     private AHomePageFacade aHomePageFacade;
-
     @Autowired
     private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
-
     @Autowired
     private AHomeOperationInfoFacade aHomeOperationInfoFacade;
-
     @Autowired
     private AMedCrisisFacade aMedCrisisFacade;
-
     @Autowired
     private AMedicalRecordFacade aMedicalRecordFacade;
-
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-
     @Autowired
-    private AMedConsultationNoteFacade aMedConsultationNoteFacade;
+    private AMedLisResultFacade aMedLisResultFacade;
+    @Autowired
+    private AMedPacsResultFacade aMedPacsResultFacade;
 
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
@@ -148,6 +138,53 @@ public class DataController {
         return aMedCrisisFacade.executeMedCrisis(list);
     }
 
+    @ApiOperation(value = "数据引擎-删除标识")
+    @PostMapping("/deleteFlag")
+    @SysLogger("deleteFlag")
+    public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO){
+        if("brzyxx".equals(aDeleteFlagVO.getModeType())){
+            return aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
+        }else if("bryz".equals(aDeleteFlagVO.getModeType())){
+            return aDoctorAdviceFacade.deleteFlag(aDeleteFlagVO);
+        }else if("basyxx".equals(aDeleteFlagVO.getModeType())){
+            return aHomePageFacade.deleteFlag(aDeleteFlagVO);
+        }else if("basyzd".equals(aDeleteFlagVO.getModeType())){
+            return aHomeDiagnoseInfoFacade.deleteFlag(aDeleteFlagVO);
+        }else if("basyss".equals(aDeleteFlagVO.getModeType())){
+            return aHomeOperationInfoFacade.deleteFlag(aDeleteFlagVO);
+        }else if("wsxx".equals(aDeleteFlagVO.getModeType())){
+            return aMedicalRecordFacade.deleteFlag(aDeleteFlagVO);
+        }else if("wsnr".equals(aDeleteFlagVO.getModeType())){
+            return aMedicalRecordContentFacade.deleteFlag(aDeleteFlagVO);
+        }else if("hyjg".equals(aDeleteFlagVO.getModeType())){
+            return aMedLisResultFacade.deleteFlag(aDeleteFlagVO);
+        }else if("jcjg".equals(aDeleteFlagVO.getModeType())){
+            return aMedPacsResultFacade.deleteFlag(aDeleteFlagVO);
+        }
+        return RespDTO.onSuc(true);
+    }
+
+    @ApiOperation(value = "数据引擎-归档标识")
+    @PostMapping("/placeFile")
+    @SysLogger("placeFile")
+    public RespDTO placeFileFlag(@RequestBody APlaceFileVO aPlaceFileVO){
+        return aBehospitalInfoFacade.placeFileFlag(aPlaceFileVO);
+    }
+
+    @ApiOperation(value = "检查")
+    @PostMapping("/sendPacsResults")
+    @SysLogger("sendPacsResults")
+    public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list){
+        return aMedPacsResultFacade.executeMedPacsResult(list);
+    }
+
+    @ApiOperation(value = "化验")
+    @PostMapping("/sendLisResults")
+    @SysLogger("sendLisResults")
+    public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list){
+        return aMedLisResultFacade.executeMedLisResult(list);
+    }
+
     @ApiOperation(value = "数据引擎-历史数据结构化处理")
     @PostMapping("/hisDataDeal")
     @SysLogger("hisDataDeal")