增加删除接口,调整病案首页时间格式

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

@@ -59,6 +59,7 @@ 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/behospitalInfo/execule").permitAll()
                 .antMatchers("/qc/behospitalInfo/analyze_rpc").permitAll()
                 .antMatchers("/qc/behospitalInfo/analyze_api").permitAll()

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

@@ -173,6 +173,7 @@ 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("/", request)) {
             return true;
         }

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade.data;
 
 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.*;
@@ -8,11 +9,9 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -113,8 +112,8 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         behospitalInfoList.stream().forEach(s -> {
             BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
                     .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N), false);
+                    .eq("hospital_id", s.getHospitalId()));
+                    //.eq("is_deleted",IsDeleteEnum.N), false);
             if (behospitalInfo != null) {
                 s.setGmtModified(new Date());
                 s.setQcTypeId(initQcTypeId(s));
@@ -175,4 +174,24 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
         return qcTypeId;
     }
+
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+        if(StringUtil.isNotBlank(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);
+            return RespDTO.onSuc(flag);
+        }
+    }
 }

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

@@ -1,14 +1,18 @@
 package com.diagbot.facade.data;
 
 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.BehospitalInfo;
 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;
@@ -106,4 +110,26 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
             doctorAdviceService.updateBatchByKey(updateE);
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+        if(StringUtil.isNotBlank(aDeleteFlagVO.getDoctorAdviceId())) {
+            return RespDTO.onError("请输入病人医嘱编码!");
+        }else if(aDeleteFlagVO.getHospitalId()==null){
+            return RespDTO.onError("请输入医院编码!");
+        }else if(StringUtil.isNotBlank(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);
+            return RespDTO.onSuc(flag);
+        }
+    }
 }

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

@@ -1,12 +1,18 @@
 package com.diagbot.facade.data;
 
 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.DoctorAdvice;
 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;
@@ -82,4 +88,26 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
             homeDiagnoseInfoService.updateBatchByKey(updateE);
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+        if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+            return RespDTO.onError("出院诊断未输入病案首页编号!");
+        }else if(aDeleteFlagVO.getHospitalId()==null){
+            return RespDTO.onError("出院诊断未输入医院编码!");
+        }else if(StringUtil.isNotBlank(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);
+            return RespDTO.onSuc(flag);
+        }
+    }
 }

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

@@ -1,12 +1,18 @@
 package com.diagbot.facade.data;
 
 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.HomeDiagnoseInfo;
 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;
@@ -85,4 +91,26 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
             homeOperationInfoService.updateBatchByKey(updateE);
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+        if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+            return RespDTO.onError("住院手术未输入病案首页编号!");
+        }else if(aDeleteFlagVO.getHospitalId()==null){
+            return RespDTO.onError("住院手术未输入医院编码!");
+        }else if(StringUtil.isNotBlank(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);
+            return RespDTO.onSuc(flag);
+        }
+    }
 }

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

@@ -1,21 +1,18 @@
 package com.diagbot.facade.data;
 
 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.HomeOperationInfo;
 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;
@@ -141,7 +138,20 @@ public class AHomePageFacade extends HomePageServiceImpl{
             //初始化入参
             HomePage homePage=new HomePage();
             BeanUtil.copyProperties(s,homePage);
-            homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+            if(StringUtil.isNotBlank(s.getBirthday())){
+                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+            }
+            if(StringUtil.isNotBlank(s.getBehospitalDate())){
+                homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
+            }
+            if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
+                //homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
+                homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm"))));
+            }
+            if(StringUtil.isNotBlank(s.getQcDate())){
+                //homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd HH:mm:ss"))));
+                homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd"))));
+            }
             homePageList.add(homePage);
 
             //初始化诊断和手术，并同步到数据库
@@ -224,10 +234,20 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 //初始化入参
                 HomePage homePage=new HomePage();
                 BeanUtil.copyProperties(s,homePage);
-                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
-                homePage.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
-                homePage.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
-                homePage.setQcDate(DateUtil.parseDateTime(s.getQcDate()));
+                if(StringUtil.isNotBlank(s.getBirthday())){
+                    homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                }
+                if(StringUtil.isNotBlank(s.getBehospitalDate())){
+                    homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
+                }
+                if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
+                    //homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
+                    homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm"))));
+                }
+                if(StringUtil.isNotBlank(s.getQcDate())){
+                    //homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd HH:mm:ss"))));
+                    homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd"))));
+                }
                 homePageList.add(homePage);
             });
             execute(homePageList);
@@ -267,4 +287,26 @@ public class AHomePageFacade extends HomePageServiceImpl{
             homePageService.updateBatchByKey(updateE);
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+       if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+            return RespDTO.onError("请输入病案首页编号!");
+       }else if(aDeleteFlagVO.getHospitalId()==null){
+            return RespDTO.onError("请输入医院编码!");
+       }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+            return RespDTO.onError("请输入病人住院编码!");
+       }else {
+            UpdateWrapper<HomePage> 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 HomePage(),updateWrapper);
+            return RespDTO.onSuc(flag);
+       }
+    }
 }

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

@@ -1,12 +1,17 @@
 package com.diagbot.facade.data;
 
 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.AMedCrisisDTO;
+import com.diagbot.entity.HomePage;
 import com.diagbot.entity.MedCrisisInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedCrisisInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedCrisisVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,4 +86,26 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
             medCrisisInfoService.updateBatchByKey(updateE);
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+        if(StringUtil.isNotBlank(aDeleteFlagVO.getRecId())){
+            return RespDTO.onError("请输入文书编码!");
+        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())) {
+            return RespDTO.onError("请输入病人住院编码!");
+        }else if(aDeleteFlagVO.getHospitalId()==null){
+            return RespDTO.onError("请输入医院编码!");
+        }else {
+            UpdateWrapper<MedCrisisInfo> 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 MedCrisisInfo(),updateWrapper);
+            return RespDTO.onSuc(flag);
+        }
+    }
 }

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

@@ -1,12 +1,19 @@
 package com.diagbot.facade.data;
 
 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.HomePage;
+import com.diagbot.entity.MedicalRecord;
 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;
@@ -75,4 +82,24 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
             medicalRecordContentService.updateBatchByKey(updateE);
         }
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+        if (StringUtil.isNotBlank(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("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                    .eq("is_deleted",IsDeleteEnum.N)
+                    .set("is_deleted",IsDeleteEnum.Y)
+                    .set("gmt_modified", DateUtil.now());
+
+            Boolean flag=update(new MedicalRecordContent(),updateWrapper);
+            return RespDTO.onSuc(flag);
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade.data;
 
 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;
@@ -12,11 +13,9 @@ import com.diagbot.facade.ModelHospitalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
-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.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedicalRecordVO;
 import com.diagbot.vo.data.AMrContentVO;
 import com.google.common.collect.Lists;
@@ -303,4 +302,36 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         return modeId;
     }
 
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        //验证数据是否存在
+        if (StringUtil.isNotBlank(aDeleteFlagVO.getRecId())) {
+            return RespDTO.onError("请输入文书序号!");
+        } else if (aDeleteFlagVO.getHospitalId() == null) {
+            return RespDTO.onError("请输入医院编码!");
+        } else if (StringUtil.isNotBlank(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);
+
+            UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();
+            updateWrapperContent.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 flagContent=aMedicalRecordContentFacade.update(new MedicalRecordContent(),updateWrapperContent);
+            return RespDTO.onSuc(flag);
+        }
+    }
+
 }

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

@@ -0,0 +1,30 @@
+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;
+
+}

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

@@ -148,4 +148,33 @@ public class DataController {
         return aMedCrisisFacade.executeMedCrisis(list);
     }
 
+    @ApiOperation(value = "数据引擎-删除标识")
+    @PostMapping("/deleteFlag")
+    @SysLogger("deleteFlag")
+    public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO){
+        if("brzyxx".equals(aDeleteFlagVO.getModeType())){
+            //住院登记
+            aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
+        }else if("bryz".equals(aDeleteFlagVO.getModeType())){
+            //病人医嘱
+            aDoctorAdviceFacade.deleteFlag(aDeleteFlagVO);
+        }else if("basyxx".equals(aDeleteFlagVO.getModeType())){
+            //病案首页
+            aHomePageFacade.deleteFlag(aDeleteFlagVO);
+        }else if("basyzd".equals(aDeleteFlagVO.getModeType())){
+            //病案诊断
+            aHomeDiagnoseInfoFacade.deleteFlag(aDeleteFlagVO);
+        }else if("basyss".equals(aDeleteFlagVO.getModeType())){
+            //病案手术
+            aHomeOperationInfoFacade.deleteFlag(aDeleteFlagVO);
+        }else if("wsxx".equals(aDeleteFlagVO.getModeType())){
+            //文书信息
+            aMedicalRecordFacade.deleteFlag(aDeleteFlagVO);
+        }else if("wsnr".equals(aDeleteFlagVO.getModeType())){
+            //文书内容
+            aMedicalRecordContentFacade.deleteFlag(aDeleteFlagVO);
+        }
+        return RespDTO.onSuc(true);
+    }
+
 }