结构化数据库表变更

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrAdmissionNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrAdmissionNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +77,26 @@ public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
         }
     }
 
+    //入院记录
+    public void dealData(StrAdmissionNote medAdmissionNote) {
+        try {
+            //判断数据库中是否存在，不存在insert
+            if (isExist(medAdmissionNote)) {
+                medAdmissionNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medAdmissionNote);
+            } else {
+                medAdmissionNote.setGmtModified(new Date());//记录修改时间
+                this.update(medAdmissionNote, new QueryWrapper<StrAdmissionNote>()
+                        .eq("rec_id", medAdmissionNote.getRecId())
+                        .eq("hospital_id", medAdmissionNote.getHospitalId())
+                        .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", medAdmissionNote.getRecId(), JSON.toJSONString(medAdmissionNote), "", e.getMessage());
+        }
+    }
+
     public Boolean isExist(StrAdmissionNote strAdmissionNote) {
         Boolean flag = true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrAdmissionNote>()
@@ -84,4 +109,32 @@ public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
         return flag;
     }
 
+    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<StrAdmissionNote> 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 StrAdmissionNote(), 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/AStrBloodResultFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrBloodResult;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrBloodResultServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrBloodResultVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,4 +84,54 @@ public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
         }
         return flag;
     }
+
+    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<StrBloodResult> 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 StrBloodResult(), 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());
+        }
+    }
+
+    public void dealData(StrBloodResult medBloodResult){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medBloodResult)){
+                medBloodResult.setGmtCreate(new Date());//记录创建时间
+                this.save(medBloodResult);
+            }else{
+                medBloodResult.setGmtModified(new Date());//记录修改时间
+                this.update(medBloodResult,new QueryWrapper<StrBloodResult>()
+                        .eq("rec_id", medBloodResult.getRecId())
+                        .eq("hospital_id", medBloodResult.getHospitalId())
+                        .eq("behospital_code", medBloodResult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价",medBloodResult.getRecId(), JSON.toJSONString(medBloodResult),"",e.getMessage());
+        }
+
+    }
 }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrBloodTransfusion;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrBloodTransfusionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrBloodTransfusionVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,4 +90,53 @@ public class AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
         }
         return flag;
     }
+
+    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<StrBloodTransfusion> 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 StrBloodTransfusion(), 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());
+        }
+    }
+
+    public void dealData(StrBloodTransfusion medBloodTransfusion){
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medBloodTransfusion)){
+                medBloodTransfusion.setGmtCreate(new Date());//记录创建时间
+                this.save(medBloodTransfusion);
+            }else{
+                medBloodTransfusion.setGmtModified(new Date());//记录修改时间
+                this.update(medBloodTransfusion,new QueryWrapper<StrBloodTransfusion>()
+                        .eq("rec_id", medBloodTransfusion.getRecId())
+                        .eq("hospital_id", medBloodTransfusion.getHospitalId())
+                        .eq("behospital_code", medBloodTransfusion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", medBloodTransfusion.getRecId(),JSON.toJSONString(medBloodTransfusion),"",e.getMessage());
+        }
+
+    }
 }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationApply;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrConsultationApplyServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrConsultationApplyVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,4 +91,53 @@ public class AStrConsultationApplyFacade extends StrConsultationApplyServiceImpl
         return flag;
     }
 
+    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<StrConsultationApply> 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 StrConsultationApply(), 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());
+        }
+    }
+
+    public void dealData(StrConsultationApply medConsultationApply){
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medConsultationApply)){
+                medConsultationApply.setGmtCreate(new Date());//记录创建时间
+                this.save(medConsultationApply);
+            }else{
+                medConsultationApply.setGmtModified(new Date());//记录修改时间
+                this.update(medConsultationApply,new QueryWrapper<StrConsultationApply>()
+                        .eq("rec_id", medConsultationApply.getRecId())
+                        .eq("hospital_id", medConsultationApply.getHospitalId())
+                        .eq("behospital_code", medConsultationApply.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单",medConsultationApply.getRecId(), JSON.toJSONString(medConsultationApply),"",e.getMessage());
+        }
+
+    }
+
 }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrConsultationNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrConsultationNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,4 +93,53 @@ public class AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
         return flag;
     }
 
+    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<StrConsultationNote> 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 StrConsultationNote(), 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());
+        }
+    }
+
+    public void dealData(StrConsultationNote medConsultationNote){
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medConsultationNote)){
+                medConsultationNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medConsultationNote);
+            }else{
+                medConsultationNote.setGmtModified(new Date());//记录修改时间
+                this.update(medConsultationNote,new QueryWrapper<StrConsultationNote>()
+                        .eq("rec_id", medConsultationNote.getRecId())
+                        .eq("hospital_id", medConsultationNote.getHospitalId())
+                        .eq("behospital_code", medConsultationNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单（申请和结果）",medConsultationNote.getRecId(), JSON.toJSONString(medConsultationNote),"",e.getMessage());
+        }
+
+    }
+
 }

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

@@ -2,14 +2,19 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationRecord;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrConsultationRecordServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.AStrConsultationRecordVO;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrConsultationNoteVO;
 import com.diagbot.vo.data.AStrConsultationResultVO;
 import org.springframework.beans.BeanUtils;
@@ -89,4 +94,53 @@ public class AStrConsultationRecordFacade extends StrConsultationRecordServiceIm
         }
         return flag;
     }
+
+    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<StrConsultationRecord> 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 StrConsultationRecord(), 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());
+        }
+    }
+
+    public void dealData(StrConsultationRecord medConsultationRecord){
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medConsultationRecord)){
+                medConsultationRecord.setGmtCreate(new Date());//记录创建时间
+                this.save(medConsultationRecord);
+            }else{
+                medConsultationRecord.setGmtModified(new Date());//记录修改时间
+                this.update(medConsultationRecord,new QueryWrapper<StrConsultationRecord>()
+                        .eq("rec_id", medConsultationRecord.getRecId())
+                        .eq("hospital_id", medConsultationRecord.getHospitalId())
+                        .eq("behospital_code", medConsultationRecord.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊记录）",medConsultationRecord.getRecId(), JSON.toJSONString(medConsultationRecord),"",e.getMessage());
+        }
+
+    }
 }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrConsultationResult;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrConsultationResultServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrConsultationResultVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,4 +92,53 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
         }
         return flag;
     }
+
+    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<StrConsultationResult> 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 StrConsultationResult(), 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());
+        }
+    }
+
+    public void dealData(StrConsultationResult medConsultationResult){
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medConsultationResult)){
+                medConsultationResult.setGmtCreate(new Date());//记录创建时间
+                this.save(medConsultationResult);
+            }else{
+                medConsultationResult.setGmtModified(new Date());//记录修改时间
+                this.update(medConsultationResult,new QueryWrapper<StrConsultationResult>()
+                        .eq("rec_id", medConsultationResult.getRecId())
+                        .eq("hospital_id", medConsultationResult.getHospitalId())
+                        .eq("behospital_code", medConsultationResult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单",medConsultationResult.getRecId(), JSON.toJSONString(medConsultationResult),"",e.getMessage());
+        }
+
+    }
 }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrCrisisNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrCrisisNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrCrisisNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,4 +87,57 @@ public class AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
         }
         return flag;
     }
+
+    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<StrCrisisNote> 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 StrCrisisNote(), 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());
+        }
+    }
+
+    public void dealData(StrCrisisNote medCrisisNote){
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medCrisisNote)){
+                medCrisisNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medCrisisNote);
+            }else{
+                medCrisisNote.setGmtModified(new Date());//记录修改时间
+                this.update(medCrisisNote,new QueryWrapper<StrCrisisNote>()
+                        .eq("rec_id", medCrisisNote.getRecId())
+                        .eq("hospital_id", medCrisisNote.getHospitalId())
+                        .eq("behospital_code", medCrisisNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录",medCrisisNote.getRecId(), JSON.toJSONString(medCrisisNote),"",e.getMessage());
+        }
+
+    }
+
+
+
+
 }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrDeathDiscussion;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrDeathDiscussionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrDeathDiscussionVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,4 +90,54 @@ public class AStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
         }
         return flag;
     }
+
+    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<StrDeathDiscussion> 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 StrDeathDiscussion(), 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());
+        }
+    }
+
+    public void dealData(StrDeathDiscussion medDeathDiscussion){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathDiscussion)){
+                medDeathDiscussion.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathDiscussion);
+            }else{
+                medDeathDiscussion.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathDiscussion,new QueryWrapper<StrDeathDiscussion>()
+                        .eq("rec_id", medDeathDiscussion.getRecId())
+                        .eq("hospital_id", medDeathDiscussion.getHospitalId())
+                        .eq("behospital_code", medDeathDiscussion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录",medDeathDiscussion.getRecId(), JSON.toJSONString(medDeathDiscussion),"",e.getMessage());
+        }
+
+    }
 }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrDeathNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrDeathNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrDeathNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,4 +90,54 @@ public class AStrDeathNoteFacade extends StrDeathNoteServiceImpl {
         }
         return flag;
     }
+
+    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<StrDeathNote> 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 StrDeathNote(), 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());
+        }
+    }
+
+    public void dealData(StrDeathNote medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrDeathNote>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
 }

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

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.MedDifficultCase;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.MedDifficultCaseServiceImpl;
 import com.diagbot.entity.StrDifficultCase;
 import com.diagbot.service.impl.StrDifficultCaseServiceImpl;
 import com.diagbot.util.DateUtil;
@@ -18,7 +16,6 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
-import com.diagbot.vo.data.AMedDifficultCaseVO;
 import com.diagbot.vo.data.AStrDifficultCaseVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +78,7 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
 
     }
 
-    public void dealData(MedDifficultCase medDifficult){
+    public void dealData(StrDifficultCase medDifficult){
 
         try {
             //判断数据库中是否存在，不存在insert
@@ -90,7 +87,7 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
                 this.save(medDifficult);
             }else{
                 medDifficult.setGmtModified(new Date());//记录修改时间
-                this.update(medDifficult,new QueryWrapper<MedDifficultCase>()
+                this.update(medDifficult,new QueryWrapper<StrDifficultCase>()
                         .eq("rec_id", medDifficult.getRecId())
                         .eq("hospital_id", medDifficult.getHospitalId())
                         .eq("behospital_code", medDifficult.getBehospitalCode()));
@@ -103,7 +100,6 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
 
     }
 
-    public Boolean isExist(MedDifficultCase medDifficult){
     public Boolean isExist(StrDifficultCase medDifficult){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrDifficultCase>()
@@ -126,7 +122,7 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
             } else if (StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
                 return RespDTO.onError("请输入病人住院编码!");
             } else {
-                UpdateWrapper<MedDifficultCase> updateWrapper = new UpdateWrapper<>();
+                UpdateWrapper<StrDifficultCase> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
                         .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
@@ -134,7 +130,7 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
                         .set("is_deleted", IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
 
-                Boolean flag = update(new MedDifficultCase(), updateWrapper);
+                Boolean flag = update(new StrDifficultCase(), updateWrapper);
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }

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

@@ -8,18 +8,15 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrFirstRecord;
 import com.diagbot.service.impl.StrFirstRecordServiceImpl;
-import com.diagbot.entity.MedFirstRecord;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.MedFirstRecordServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrFirstRecordVO;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
-import com.diagbot.vo.data.AMedFirstRecordVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -29,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 @Component
-public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
+public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
 
     @Autowired
     private ColumnFacade columnFacade;
@@ -82,7 +79,7 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
 
     }
 
-    public void dealData(MedFirstRecord medFirstRecord){
+    public void dealData(StrFirstRecord medFirstRecord){
         try {
             //判断数据库中是否存在，不存在insert
             if(isExist(medFirstRecord)){
@@ -90,7 +87,7 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
                 this.save(medFirstRecord);
             }else{
                 medFirstRecord.setGmtModified(new Date());//记录修改时间
-                this.update(medFirstRecord,new QueryWrapper<MedFirstRecord>()
+                this.update(medFirstRecord,new QueryWrapper<StrFirstRecord>()
                         .eq("rec_id", medFirstRecord.getRecId())
                         .eq("hospital_id", medFirstRecord.getHospitalId())
                         .eq("behospital_code", medFirstRecord.getBehospitalCode()));
@@ -102,8 +99,6 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
         }
 
     }
-
-    public Boolean isExist(MedFirstRecord medFirstRecord){
     public Boolean isExist(StrFirstRecord strFirstRecord){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrFirstRecord>()
@@ -126,7 +121,7 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
             } else if (StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
                 return RespDTO.onError("请输入病人住院编码!");
             } else {
-                UpdateWrapper<MedFirstRecord> updateWrapper = new UpdateWrapper<>();
+                UpdateWrapper<StrFirstRecord> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
                         .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
@@ -134,7 +129,7 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
                         .set("is_deleted", IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
 
-                Boolean flag = update(new MedFirstRecord(), updateWrapper);
+                Boolean flag = update(new StrFirstRecord(), updateWrapper);
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }

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

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrIllCritically;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrIllCriticallyServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrIllCriticallyVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +76,28 @@ public class AStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
 
     }
 
+    public void dealData(StrIllCritically medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrIllCritically>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病危通知单", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrIllCritically strIllCritically){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrIllCritically>()
@@ -82,4 +109,32 @@ public class AStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
         }
         return flag;
     }
+
+    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<StrIllCritically> 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 StrIllCritically(), 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/AStrIllSeriouslFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrIllSeriousl;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrIllSeriouslServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrIllSeriouslVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +76,28 @@ public class AStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
 
     }
 
+    public void dealData(StrIllSeriousl medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrIllSeriousl>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrIllSeriousl strIllSeriousl){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrIllSeriousl>()
@@ -82,4 +109,32 @@ public class AStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
         }
         return flag;
     }
+
+    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<StrIllSeriousl> 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 StrIllSeriousl(), 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/AStrLeaveHospitalFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrLeaveHospital;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrLeaveHospitalServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrLeaveHospitalVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +79,28 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
 
     }
 
+    public void dealData(StrLeaveHospital medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrLeaveHospital>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("出院小结", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrLeaveHospital strLeaveHospital){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrLeaveHospital>()
@@ -85,4 +112,32 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
         }
         return flag;
     }
+
+    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<StrLeaveHospital> 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 StrLeaveHospital(), 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/AStrOperativeFirstRecord.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrOperativeFirstRecord;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrOperativeFirstRecordServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrOperativeFirstRecordVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +81,28 @@ public class AStrOperativeFirstRecord extends StrOperativeFirstRecordServiceImpl
 
     }
 
+    public void dealData(StrOperativeFirstRecord medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrOperativeFirstRecord>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("术后首程", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrOperativeFirstRecord strOperativeFirstRecord){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrOperativeFirstRecord>()
@@ -87,4 +114,31 @@ public class AStrOperativeFirstRecord extends StrOperativeFirstRecordServiceImpl
         }
         return flag;
     }
+    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<StrOperativeFirstRecord> 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 StrOperativeFirstRecord(), 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/AStrOperativeNoteFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrOperativeNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrOperativeNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrOperativeNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,6 +80,28 @@ public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
 
     }
 
+    public void dealData(StrOperativeNote medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrOperativeNote>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("手术记录", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrOperativeNote strOperativeNote){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrOperativeNote>()
@@ -86,4 +113,32 @@ public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
         }
         return flag;
     }
+
+    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<StrOperativeNote> 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 StrOperativeNote(), 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/AStrPeriodConclusionFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrPeriodConclusion;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrPeriodConclusionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrAdmissionNoteVO;
 import com.diagbot.vo.data.AStrPeriodConclusionVO;
 import org.springframework.beans.BeanUtils;
@@ -73,6 +78,28 @@ public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
 
     }
 
+    public void dealData(StrPeriodConclusion medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrPeriodConclusion>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("阶段小结", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrPeriodConclusion strPeriodConclusion){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrPeriodConclusion>()
@@ -85,4 +112,32 @@ public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
         return flag;
     }
 
+    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<StrPeriodConclusion> 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 StrPeriodConclusion(), 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/AStrPreoperativeDiscussionFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrPreoperativeDiscussion;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrPreoperativeDiscussionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrPreoperativeDiscussionVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +78,28 @@ public class AStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionS
 
     }
 
+    public void dealData(StrPreoperativeDiscussion medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrPreoperativeDiscussion>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("术前讨论小结", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrPreoperativeDiscussion strPreoperativeDiscussion){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrPreoperativeDiscussion>()
@@ -84,4 +111,32 @@ public class AStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionS
         }
         return flag;
     }
+
+    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<StrPreoperativeDiscussion> 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 StrPreoperativeDiscussion(), 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/AStrRescueNoteFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrRescueNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrRescueNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrRescueNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +78,28 @@ public class AStrRescueNoteFacade extends StrRescueNoteServiceImpl {
 
     }
 
+    public void dealData(StrRescueNote medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrRescueNote>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("抢救记录", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrRescueNote strRescueNote){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrRescueNote>()
@@ -84,4 +111,33 @@ public class AStrRescueNoteFacade extends StrRescueNoteServiceImpl {
         }
         return flag;
     }
+
+
+    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<StrRescueNote> 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 StrRescueNote(), 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/AStrTransferInNoteFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrTransferInNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrTransferInNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrTransferInNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +77,28 @@ public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
 
     }
 
+    public void dealData(StrTransferInNote medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrTransferInNote>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("转入记录", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
+    }
+
     public Boolean isExist(StrTransferInNote strTransferInNote){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrTransferInNote>()
@@ -84,4 +111,32 @@ public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
         return flag;
     }
 
+    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<StrTransferInNote> 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 StrTransferInNote(), 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/AStrTransferOutNoteFacade.java

@@ -2,13 +2,18 @@ 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.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrTransferOutNote;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.StrTransferOutNoteServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrTransferOutNoteVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +74,28 @@ public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
             aMedAbnormalInfoFacade.saveAbnormalInfo("转出记录",strTransferOutNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
+    }
+
+     public void dealData(StrTransferOutNote medDeathNote){
+
+        try {
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<StrTransferOutNote>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("转出记录", medDeathNote.getRecId(),JSON.toJSONString(medDeathNote),"",e.getMessage());
+        }
+
     }
 
     public Boolean isExist(StrTransferOutNote strTransferOutNote){
@@ -82,4 +109,32 @@ public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
         }
         return flag;
     }
+
+    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<StrTransferOutNote> 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 StrTransferOutNote(), 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/AStrWardRecordFacade.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.MedWardRecord;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.MedWardRecordServiceImpl;
 import com.diagbot.entity.StrWardRecord;
 import com.diagbot.service.impl.StrWardRecordServiceImpl;
 import com.diagbot.util.DateUtil;
@@ -18,7 +16,6 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
-import com.diagbot.vo.data.AMedWardRecordVO;
 import com.diagbot.vo.data.AStrWardRecordVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,8 +80,7 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
 
     }
 
-    public Boolean isExist(StrWardRecord strWardRecord){
-    public void dealData(MedWardRecord medWardRecord){
+    public void dealData(StrWardRecord medWardRecord){
         try {
             //判断数据库中是否存在，不存在insert
             if(isExist(medWardRecord)){
@@ -92,7 +88,7 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
                 this.save(medWardRecord);
             }else{
                 medWardRecord.setGmtModified(new Date());//记录修改时间
-                this.update(medWardRecord,new QueryWrapper<MedWardRecord>()
+                this.update(medWardRecord,new QueryWrapper<StrWardRecord>()
                         .eq("rec_id", medWardRecord.getRecId())
                         .eq("hospital_id", medWardRecord.getHospitalId())
                         .eq("behospital_code", medWardRecord.getBehospitalCode()));
@@ -105,7 +101,8 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
 
     }
 
-    public Boolean isExist(MedWardRecord medWardRecord){
+
+    public Boolean isExist(StrWardRecord strWardRecord){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrWardRecord>()
                 .eq("rec_id", strWardRecord.getRecId())
@@ -127,7 +124,7 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
             } else if (StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
                 return RespDTO.onError("请输入病人住院编码!");
             } else {
-                UpdateWrapper<MedWardRecord> updateWrapper = new UpdateWrapper<>();
+                UpdateWrapper<StrWardRecord> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
                         .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
@@ -135,7 +132,7 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
                         .set("is_deleted", IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
 
-                Boolean flag = update(new MedWardRecord(), updateWrapper);
+                Boolean flag = update(new StrWardRecord(), updateWrapper);
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }

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

@@ -20,51 +20,51 @@ public class DeleteFlagFacade {
 
 
     @Autowired
-    private AMedAdmissionNoteFacade aMedAdmissionNoteFacade;
+    private AStrAdmissionNoteFacade aStrAdmissionNoteFacade;
     @Autowired
-    private AMedFirstRecordFacade aMedFirstRecordFacade;
+    private AStrFirstRecordFacade aStrFirstRecordFacade;
     @Autowired
-    private AMedPeriodConclusionFacade aMedPeriodConclusionFacade;
+    private AStrPeriodConclusionFacade aStrPeriodConclusionFacade;
     @Autowired
-    private AMedBloodResultFacade aMedBloodResultFacade;
+    private AStrBloodResultFacade aStrBloodResultFacade;
     @Autowired
-    private AMedBloodTransfusionFacade aMedBloodTransfusionFacade;
+    private AStrBloodTransfusionFacade aStrBloodTransfusionFacade;
     @Autowired
-    private AMedTransferInNoteFacade aMedTransferInNoteFacade;
+    private AStrTransferInNoteFacade aStrTransferInNoteFacade;
     @Autowired
-    private AMedTransferOutNoteFacade aMedTransferOutNoteFacade;
+    private AStrTransferOutNoteFacade aStrTransferOutNoteFacade;
     @Autowired
-    private AMedIllSeriouslFacade aMedIllSeriouslFacade;
+    private AStrIllSeriouslFacade aStrIllSeriouslFacade;
     @Autowired
-    private AMedIllCriticallyFacade aMedIllCriticallyFacade;
+    private AStrIllCriticallyFacade aStrIllCriticallyFacade;
     @Autowired
-    private AMedDifficultCaseFacade aMedDifficultCaseFacade;
+    private AStrDifficultCaseFacade aStrDifficultCaseFacade;
     @Autowired
-    private AMedDeathNoteFacade aMedDeathNoteFacade;
+    private AStrDeathNoteFacade aStrDeathNoteFacade;
     @Autowired
-    private AMedDeathDiscussionFacade aMedDeathDiscussionFacade;
+    private AStrDeathDiscussionFacade aStrDeathDiscussionFacade;
     @Autowired
-    private AMedWardRecordFacade aMedWardRecordFacade;
+    private AStrWardRecordFacade aStrWardRecordFacade;
     @Autowired
-    private AMedOperativeFirstRecord aMedOperativeFirstRecord;
+    private AStrOperativeFirstRecord aStrOperativeFirstRecord;
     @Autowired
-    private AMedPreoperativeDiscussionFacade aMedPreoperativeDiscussionFacade;
+    private AStrPreoperativeDiscussionFacade aStrPreoperativeDiscussionFacade;
     @Autowired
-    private AMedOperativeNoteFacade aMedOperativeNoteFacade;
+    private AStrOperativeNoteFacade aStrOperativeNoteFacade;
     @Autowired
-    private AMedRescueNoteFacade aMedRescueNoteFacade;
+    private AStrRescueNoteFacade aStrRescueNoteFacade;
     @Autowired
-    private AMedCrisisNoteFacade aMedCrisisNoteFacade;
+    private AStrCrisisNoteFacade aStrCrisisNoteFacade;
     @Autowired
-    private AMedLeaveHospitalFacade aMedLeaveHospitalFacade;
+    private AStrLeaveHospitalFacade aStrLeaveHospitalFacade;
     @Autowired
-    private AMedConsultationApplyFacade aMedConsultationApplyFacade;
+    private AStrConsultationApplyFacade aStrConsultationApplyFacade;
     @Autowired
-    private AMedConsultationResultFacade aMedConsultationResultFacade;
+    private AStrConsultationResultFacade aStrConsultationResultFacade;
     @Autowired
-    private AMedConsultationNoteFacade aMedConsultationNoteFacade;
+    private AStrConsultationNoteFacade aStrConsultationNoteFacade;
     @Autowired
-    private AMedConsultationRecordFacade aMedConsultationRecordFacade;
+    private AStrConsultationRecordFacade aStrConsultationRecordFacade;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
@@ -93,51 +93,51 @@ public class DeleteFlagFacade {
         aDeleteFlagVO.setBehospitalCode(aDeleteFlagVO.getBehospitalCode()+aDeleteFlagVO.getBehospitalId());
         try {
             if("入院记录".equals(modelName)){
-                aMedAdmissionNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrAdmissionNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if("首次病程录".equals(modelName)){
-                aMedFirstRecordFacade.deleteFlag(aDeleteFlagVO);
+                aStrFirstRecordFacade.deleteFlag(aDeleteFlagVO);
             }else if("输血后效果评价".equals(modelName)){
-                aMedBloodResultFacade.deleteFlag(aDeleteFlagVO);
+                aStrBloodResultFacade.deleteFlag(aDeleteFlagVO);
             }else if("输血/血制品病程记录".equals(modelName)){
-              aMedBloodTransfusionFacade.deleteFlag(aDeleteFlagVO);
+                aStrBloodTransfusionFacade.deleteFlag(aDeleteFlagVO);
             }else if("转入记录".equals(modelName)){
-               aMedTransferInNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrTransferInNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if("转出记录".equals(modelName)){
-                aMedTransferOutNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrTransferOutNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if("病危通知书".equals(modelName)){
-                aMedIllCriticallyFacade.deleteFlag(aDeleteFlagVO);
+                aStrIllCriticallyFacade.deleteFlag(aDeleteFlagVO);
             }else if("病重通知书".equals(modelName)){
-                aMedIllSeriouslFacade.deleteFlag(aDeleteFlagVO);
+                aStrIllSeriouslFacade.deleteFlag(aDeleteFlagVO);
             }else if("疑难病例讨论记录".equals(modelName)){
-                aMedDifficultCaseFacade.deleteFlag(aDeleteFlagVO);
+                aStrDifficultCaseFacade.deleteFlag(aDeleteFlagVO);
             }else if("死亡记录".equals(modelName)){
-                aMedDeathNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrDeathNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if("死亡病例讨论记录".equals(modelName)){
-                aMedDeathDiscussionFacade.deleteFlag(aDeleteFlagVO);
+                aStrDeathDiscussionFacade.deleteFlag(aDeleteFlagVO);
             }else if("查房记录".equals(modelName)){
-                aMedWardRecordFacade.deleteFlag(aDeleteFlagVO);
+                aStrWardRecordFacade.deleteFlag(aDeleteFlagVO);
             }else if("术后首次病程及谈话记录".equals(modelName)){
-                aMedOperativeFirstRecord.deleteFlag(aDeleteFlagVO);
+                aStrOperativeFirstRecord.deleteFlag(aDeleteFlagVO);
             }else if("术前讨论、术前小结".equals(modelName)){
-                aMedPreoperativeDiscussionFacade.deleteFlag(aDeleteFlagVO);
+                aStrPreoperativeDiscussionFacade.deleteFlag(aDeleteFlagVO);
             }else if("手术记录".equals(modelName)){
-                aMedOperativeNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrOperativeNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if("抢救记录".equals(modelName)){
-                aMedRescueNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrRescueNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if("危急值记录".equals(modelName)){
-                aMedCrisisNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrCrisisNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if("出院小结".equals(modelName)){
-                aMedLeaveHospitalFacade.deleteFlag(aDeleteFlagVO);
+                aStrLeaveHospitalFacade.deleteFlag(aDeleteFlagVO);
             }else if("会诊申请单".equals(modelName)){
-               aMedConsultationApplyFacade.deleteFlag(aDeleteFlagVO);
+                aStrConsultationApplyFacade.deleteFlag(aDeleteFlagVO);
             }else if("会诊结果单".equals(modelName)){
-                aMedConsultationResultFacade.deleteFlag(aDeleteFlagVO);
+                aStrConsultationResultFacade.deleteFlag(aDeleteFlagVO);
             }else if("会诊单".equals(modelName)){
-                aMedConsultationNoteFacade.deleteFlag(aDeleteFlagVO);
+                aStrConsultationNoteFacade.deleteFlag(aDeleteFlagVO);
             }else if ("会诊记录".equals(modelName)){
-                aMedConsultationRecordFacade.deleteFlag(aDeleteFlagVO);
+                aStrConsultationRecordFacade.deleteFlag(aDeleteFlagVO);
             } else if("阶段小结".equals(modelName)){
-                aMedPeriodConclusionFacade.deleteFlag(aDeleteFlagVO);
+                aStrPeriodConclusionFacade.deleteFlag(aDeleteFlagVO);
             }else if ("病案首页".equals(modelName)){
                 aHomePageFacade.deleteFlag(aDeleteFlagVO);//病案首页
             }else if ("医嘱信息".equals(modelName)){

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

@@ -17,7 +17,6 @@ import com.diagbot.util.ReadProperties;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.QueryVo;
-import com.diagbot.vo.data.AMedAdmissionNoteVO;
 import com.diagbot.vo.data.AMrContentVO;
 import com.diagbot.vo.data.StructuralDataVo;
 import lombok.extern.slf4j.Slf4j;
@@ -33,51 +32,51 @@ import java.util.Map;
 @Component
 public class StructuralDataFacade {
     @Autowired
-    private AMedAdmissionNoteFacade aMedAdmissionNoteFacade;
+    private AStrAdmissionNoteFacade aStrAdmissionNoteFacade;
     @Autowired
-    private AMedFirstRecordFacade aMedFirstRecordFacade;
+    private AStrFirstRecordFacade aStrFirstRecordFacade;
     @Autowired
-    private AMedPeriodConclusionFacade aMedPeriodConclusionFacade;
+    private AStrPeriodConclusionFacade aStrPeriodConclusionFacade;
     @Autowired
-    private AMedBloodResultFacade aMedBloodResultFacade;
+    private AStrBloodResultFacade aStrBloodResultFacade;
     @Autowired
-    private AMedBloodTransfusionFacade aMedBloodTransfusionFacade;
+    private AStrBloodTransfusionFacade aStrBloodTransfusionFacade;
     @Autowired
-    private AMedTransferInNoteFacade aMedTransferInNoteFacade;
+    private AStrTransferInNoteFacade aStrTransferInNoteFacade;
     @Autowired
-    private AMedTransferOutNoteFacade aMedTransferOutNoteFacade;
+    private AStrTransferOutNoteFacade aStrTransferOutNoteFacade;
     @Autowired
-    private AMedIllSeriouslFacade aMedIllSeriouslFacade;
+    private AStrIllSeriouslFacade aStrIllSeriouslFacade;
     @Autowired
-    private AMedIllCriticallyFacade aMedIllCriticallyFacade;
+    private AStrIllCriticallyFacade aStrIllCriticallyFacade;
     @Autowired
-    private AMedDifficultCaseFacade aMedDifficultCaseFacade;
+    private AStrDifficultCaseFacade aStrDifficultCaseFacade;
     @Autowired
-    private AMedDeathNoteFacade aMedDeathNoteFacade;
+    private AStrDeathNoteFacade aStrDeathNoteFacade;
     @Autowired
-    private AMedDeathDiscussionFacade aMedDeathDiscussionFacade;
+    private AStrDeathDiscussionFacade aStrDeathDiscussionFacade;
     @Autowired
-    private AMedWardRecordFacade aMedWardRecordFacade;
+    private AStrWardRecordFacade aStrWardRecordFacade;
     @Autowired
-    private AMedOperativeFirstRecord aMedOperativeFirstRecord;
+    private AStrOperativeFirstRecord aStrOperativeFirstRecord;
     @Autowired
-    private AMedPreoperativeDiscussionFacade aMedPreoperativeDiscussionFacade;
+    private AStrPreoperativeDiscussionFacade aStrPreoperativeDiscussionFacade;
     @Autowired
-    private AMedOperativeNoteFacade aMedOperativeNoteFacade;
+    private AStrOperativeNoteFacade aStrOperativeNoteFacade;
     @Autowired
-    private AMedRescueNoteFacade aMedRescueNoteFacade;
+    private AStrRescueNoteFacade aStrRescueNoteFacade;
     @Autowired
-    private AMedCrisisNoteFacade aMedCrisisNoteFacade;
+    private AStrCrisisNoteFacade aStrCrisisNoteFacade;
     @Autowired
-    private AMedLeaveHospitalFacade aMedLeaveHospitalFacade;
+    private AStrLeaveHospitalFacade aStrLeaveHospitalFacade;
     @Autowired
-    private AMedConsultationApplyFacade aMedConsultationApplyFacade;
+    private AStrConsultationApplyFacade aStrConsultationApplyFacade;
     @Autowired
-    private AMedConsultationResultFacade aMedConsultationResultFacade;
+    private AStrConsultationResultFacade aStrConsultationResultFacade;
     @Autowired
-    private AMedConsultationNoteFacade aMedConsultationNoteFacade;
+    private AStrConsultationNoteFacade aStrConsultationNoteFacade;
     @Autowired
-    private AMedConsultationRecordFacade aMedConsultationRecordFacade;
+    private AStrConsultationRecordFacade aStrConsultationRecordFacade;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
@@ -145,119 +144,119 @@ public class StructuralDataFacade {
         try {
             if("入院记录".equals(modelName)){
                 //从传来的modeId得到所对对映的视图上的表名
-                List<MedAdmissionNote> medAdmissionNote =fjtzDBConn.getMedAdmissionNote(this.sql(s));
+                List<StrAdmissionNote> medAdmissionNote =fjtzDBConn.getMedAdmissionNote(this.sql(s));
                 if (medAdmissionNote.size()>0){
-                    aMedAdmissionNoteFacade.dealData(medAdmissionNote.get(0));
+                    aStrAdmissionNoteFacade.dealData(medAdmissionNote.get(0));
                 }
             }else if("首次病程录".equals(modelName)){
-                List<MedFirstRecord> medFirstRecords =fjtzDBConn.getMedFirstRecord(this.sql(s));
+                List<StrFirstRecord> medFirstRecords =fjtzDBConn.getMedFirstRecord(this.sql(s));
                 if (medFirstRecords.size()>0){
-                    aMedFirstRecordFacade.dealData(medFirstRecords.get(0));
+                    aStrFirstRecordFacade.dealData(medFirstRecords.get(0));
                 }
             }else if("输血后效果评价".equals(modelName)){
-                List<MedBloodResult> medBloodResults =fjtzDBConn.getMedBloodResult(this.sql(s));
+                List<StrBloodResult> medBloodResults =fjtzDBConn.getMedBloodResult(this.sql(s));
                 if (medBloodResults.size()>0){
-                    aMedBloodResultFacade.dealData(medBloodResults.get(0));
+                    aStrBloodResultFacade.dealData(medBloodResults.get(0));
                 }
             }else if("输血/血制品病程记录".equals(modelName)){
-                List<MedBloodTransfusion> medBloodTransfusions =fjtzDBConn.getMedBloodTransfusion(this.sql(s));
+                List<StrBloodTransfusion> medBloodTransfusions =fjtzDBConn.getMedBloodTransfusion(this.sql(s));
                 if (medBloodTransfusions.size()>0){
-                    aMedBloodTransfusionFacade.dealData(medBloodTransfusions.get(0));
+                    aStrBloodTransfusionFacade.dealData(medBloodTransfusions.get(0));
                 }
             }else if("转入记录".equals(modelName)){
-                List<MedTransferInNote> medTransferInNotes =fjtzDBConn.getMedTransferInNote(this.sql(s));
+                List<StrTransferInNote> medTransferInNotes =fjtzDBConn.getMedTransferInNote(this.sql(s));
                 if (medTransferInNotes.size()>0){
-                    aMedTransferInNoteFacade.dealData(medTransferInNotes.get(0));
+                    aStrTransferInNoteFacade.dealData(medTransferInNotes.get(0));
                 }
             }else if("转出记录".equals(modelName)){
-                List<MedTransferOutNote> medTransferOutNotes =fjtzDBConn.getMedTransferOutNote(this.sql(s));
+                List<StrTransferOutNote> medTransferOutNotes =fjtzDBConn.getMedTransferOutNote(this.sql(s));
                 if (medTransferOutNotes.size()>0){
-                    aMedTransferOutNoteFacade.dealData(medTransferOutNotes.get(0));
+                    aStrTransferOutNoteFacade.dealData(medTransferOutNotes.get(0));
                 }
             }else if("病危通知书".equals(modelName)){
-                List<MedIllCritically> medIllCritically =fjtzDBConn.getMedIllCritically(this.sql(s));
+                List<StrIllCritically> medIllCritically =fjtzDBConn.getMedIllCritically(this.sql(s));
                 if (medIllCritically.size()>0){
-                    aMedIllCriticallyFacade.dealData(medIllCritically.get(0));
+                    aStrIllCriticallyFacade.dealData(medIllCritically.get(0));
                 }
             }else if("病重通知书".equals(modelName)){
-                List<MedIllSeriousl> medIllSeriousl =fjtzDBConn.getMedIllSeriousl(this.sql(s));
+                List<StrIllSeriousl> medIllSeriousl =fjtzDBConn.getMedIllSeriousl(this.sql(s));
                 if (medIllSeriousl.size()>0){
-                    aMedIllSeriouslFacade.dealData(medIllSeriousl.get(0));
+                    aStrIllSeriouslFacade.dealData(medIllSeriousl.get(0));
                 }
             }else if("疑难病例讨论记录".equals(modelName)){
-                List<MedDifficultCase> medDifficultCase =fjtzDBConn.getMedDifficultCase(this.sql(s));
+                List<StrDifficultCase> medDifficultCase =fjtzDBConn.getMedDifficultCase(this.sql(s));
                 if (medDifficultCase.size()>0){
-                    aMedDifficultCaseFacade.dealData(medDifficultCase.get(0));
+                    aStrDifficultCaseFacade.dealData(medDifficultCase.get(0));
                 }
             }else if("死亡记录".equals(modelName)){
-                List<MedDeathNote> medDeathNote =fjtzDBConn.getMedDeathNote(this.sql(s));
+                List<StrDeathNote> medDeathNote =fjtzDBConn.getMedDeathNote(this.sql(s));
                 if (medDeathNote.size()>0){
-                    aMedDeathNoteFacade.dealData(medDeathNote.get(0));
+                    aStrDeathNoteFacade.dealData(medDeathNote.get(0));
                 }
             }else if("死亡病例讨论记录".equals(modelName)){
-                List<MedDeathDiscussion> medDeathDiscussion =fjtzDBConn.getMedDeathDiscussion(this.sql(s));
+                List<StrDeathDiscussion> medDeathDiscussion =fjtzDBConn.getMedDeathDiscussion(this.sql(s));
                 if (medDeathDiscussion.size()>0){
-                    aMedDeathDiscussionFacade.dealData(medDeathDiscussion.get(0));
+                    aStrDeathDiscussionFacade.dealData(medDeathDiscussion.get(0));
                 }
             }else if("查房记录".equals(modelName)){
-                List<MedWardRecord> medWardRecords =fjtzDBConn.getMedWardRecord(this.sql(s));
+                List<StrWardRecord> medWardRecords =fjtzDBConn.getMedWardRecord(this.sql(s));
                 if (medWardRecords.size()>0){
-                    aMedWardRecordFacade.dealData(medWardRecords.get(0));
+                    aStrWardRecordFacade.dealData(medWardRecords.get(0));
                 }
             }else if("术后首次病程及谈话记录".equals(modelName)){
-                List<MedOperativeFirstRecord> medOperativeFirstRecord =fjtzDBConn.getMedOperativeFirstRecord(this.sql(s));
+                List<StrOperativeFirstRecord> medOperativeFirstRecord =fjtzDBConn.getMedOperativeFirstRecord(this.sql(s));
                 if (medOperativeFirstRecord.size()>0){
-                    aMedOperativeFirstRecord.dealData(medOperativeFirstRecord.get(0));
+                    aStrOperativeFirstRecord.dealData(medOperativeFirstRecord.get(0));
                 }
             }else if("术前讨论、术前小结".equals(modelName)){
-                List<MedPreoperativeDiscussion> medPreoperativeDiscussion =fjtzDBConn.getMedPreoperativeDiscussion(this.sql(s));
+                List<StrPreoperativeDiscussion> medPreoperativeDiscussion =fjtzDBConn.getMedPreoperativeDiscussion(this.sql(s));
                 if (medPreoperativeDiscussion.size()>0){
-                    aMedPreoperativeDiscussionFacade.dealData(medPreoperativeDiscussion.get(0));
+                    aStrPreoperativeDiscussionFacade.dealData(medPreoperativeDiscussion.get(0));
                 }
             }else if("手术记录".equals(modelName)){
-                List<MedOperativeNote> medOperativeNote =fjtzDBConn.getMedOperativeNote(this.sql(s));
+                List<StrOperativeNote> medOperativeNote =fjtzDBConn.getMedOperativeNote(this.sql(s));
                 if (medOperativeNote.size()>0){
-                    aMedOperativeNoteFacade.dealData(medOperativeNote.get(0));
+                    aStrOperativeNoteFacade.dealData(medOperativeNote.get(0));
                 }
             }else if("抢救记录".equals(modelName)){
-                List<MedRescueNote> medRescueNotes =fjtzDBConn.getMedRescueNote(this.sql(s));
+                List<StrRescueNote> medRescueNotes =fjtzDBConn.getMedRescueNote(this.sql(s));
                 if (medRescueNotes.size()>0){
-                    aMedRescueNoteFacade.dealData(medRescueNotes.get(0));
+                    aStrRescueNoteFacade.dealData(medRescueNotes.get(0));
                 }
             }else if("危急值记录".equals(modelName)){
-                List<MedCrisisNote> medCrisisNote =fjtzDBConn.getMedCrisisNote(this.sql(s));
+                List<StrCrisisNote> medCrisisNote =fjtzDBConn.getMedCrisisNote(this.sql(s));
                 if (medCrisisNote.size()>0){
-                    aMedCrisisNoteFacade.dealData(medCrisisNote.get(0));
+                    aStrCrisisNoteFacade.dealData(medCrisisNote.get(0));
                 }
             }else if("出院小结".equals(modelName)){
-                List<MedLeaveHospital> medLeaveHospital =fjtzDBConn.getMedLeaveHospital(this.sql(s));
+                List<StrLeaveHospital> medLeaveHospital =fjtzDBConn.getMedLeaveHospital(this.sql(s));
                 if (medLeaveHospital.size()>0){
-                    aMedLeaveHospitalFacade.dealData(medLeaveHospital.get(0));
+                    aStrLeaveHospitalFacade.dealData(medLeaveHospital.get(0));
                 }
             }else if("会诊申请单".equals(modelName)){
-                List<MedConsultationApply> medConsultationApply =fjtzDBConn.getMedConsultationApply(this.sql(s));
+                List<StrConsultationApply> medConsultationApply =fjtzDBConn.getMedConsultationApply(this.sql(s));
                 if (medConsultationApply.size()>0){
-                    aMedConsultationApplyFacade.dealData(medConsultationApply.get(0));
+                    aStrConsultationApplyFacade.dealData(medConsultationApply.get(0));
                 }
             }else if("会诊结果单".equals(modelName)){
-                List<MedConsultationResult> medConsultationResult =fjtzDBConn.getMedConsultationResult(this.sql(s));
+                List<StrConsultationResult> medConsultationResult =fjtzDBConn.getMedConsultationResult(this.sql(s));
                 if (medConsultationResult.size()>0){
-                    aMedConsultationResultFacade.dealData(medConsultationResult.get(0));
+                    aStrConsultationResultFacade.dealData(medConsultationResult.get(0));
                 }
             }else if("会诊单".equals(modelName)){
-                List<MedConsultationNote> medConsultationNote =fjtzDBConn.getMedConsultationNote(this.sql(s));
+                List<StrConsultationNote> medConsultationNote =fjtzDBConn.getMedConsultationNote(this.sql(s));
                 if (medConsultationNote.size()>0){
-                    aMedConsultationNoteFacade.dealData(medConsultationNote.get(0));
+                    aStrConsultationNoteFacade.dealData(medConsultationNote.get(0));
                 }
             }else if ("会诊记录".equals(modelName)){
-                List<MedConsultationRecord> medConsultationRecord =fjtzDBConn.getMedConsultationRecord(this.sql(s));
+                List<StrConsultationRecord> medConsultationRecord =fjtzDBConn.getMedConsultationRecord(this.sql(s));
                 if (medConsultationRecord.size()>0){
-                    aMedConsultationRecordFacade.dealData(medConsultationRecord.get(0));
+                    aStrConsultationRecordFacade.dealData(medConsultationRecord.get(0));
                 }
             } else if("阶段小结".equals(modelName)){
-                List<MedPeriodConclusion> medPeriodConclusion =fjtzDBConn.getMedPeriodConclusion(this.sql(s));
+                List<StrPeriodConclusion> medPeriodConclusion =fjtzDBConn.getMedPeriodConclusion(this.sql(s));
                 if (medPeriodConclusion.size()>0){
-                    aMedPeriodConclusionFacade.dealData(medPeriodConclusion.get(0));
+                    aStrPeriodConclusionFacade.dealData(medPeriodConclusion.get(0));
                 }
             }else if ("病案首页".equals(modelName)){
                 List<HomePage> homePage =fjtzDBConn.getHomePage(this.sql(s));

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

@@ -759,13 +759,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedConsultationNote> getMedConsultationNote(String sql){
-		List<MedConsultationNote> medConsultationNotes=Lists.newLinkedList();
+	public List<StrConsultationNote> getMedConsultationNote(String sql){
+		List<StrConsultationNote> medConsultationNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedConsultationNote medConsultationNote=new MedConsultationNote();
+				StrConsultationNote medConsultationNote=new StrConsultationNote();
 				medConsultationNote.setRecId(rs.getString(""));//记录编号
 				medConsultationNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medConsultationNote.setBehospitalCode(rs.getString(""));//病历号
@@ -811,13 +811,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedConsultationApply> getMedConsultationApply(String sql){
-		List<MedConsultationApply> medConsultationApplies=Lists.newLinkedList();
+	public List<StrConsultationApply> getMedConsultationApply(String sql){
+		List<StrConsultationApply> medConsultationApplies=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedConsultationApply medConsultationApply=new MedConsultationApply();
+				StrConsultationApply medConsultationApply=new StrConsultationApply();
 				medConsultationApply.setRecId(rs.getString(""));//记录编号
 				medConsultationApply.setHospitalId(HOSPITAL_ID);//医院ID
 				medConsultationApply.setBehospitalCode(rs.getString(""));//病历号
@@ -863,13 +863,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedConsultationResult> getMedConsultationResult(String sql){
-		List<MedConsultationResult> medConsultationResults=Lists.newLinkedList();
+	public List<StrConsultationResult> getMedConsultationResult(String sql){
+		List<StrConsultationResult> medConsultationResults=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedConsultationResult medConsultationResult=new MedConsultationResult();
+				StrConsultationResult medConsultationResult=new StrConsultationResult();
 				medConsultationResult.setRecId(rs.getString(""));//记录编号
 				medConsultationResult.setHospitalId(HOSPITAL_ID);//医院ID
 				medConsultationResult.setBehospitalCode(rs.getString(""));//病历号
@@ -914,13 +914,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedConsultationRecord> getMedConsultationRecord(String sql){
-		List<MedConsultationRecord> medConsultationRecords=Lists.newLinkedList();
+	public List<StrConsultationRecord> getMedConsultationRecord(String sql){
+		List<StrConsultationRecord> medConsultationRecords=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedConsultationRecord medConsultationRecord=new MedConsultationRecord();
+				StrConsultationRecord medConsultationRecord=new StrConsultationRecord();
 				medConsultationRecord.setRecId(rs.getString(""));//记录编号
 				medConsultationRecord.setHospitalId(HOSPITAL_ID);//医院ID
 				medConsultationRecord.setBehospitalCode(rs.getString(""));//病历号
@@ -968,13 +968,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedAdmissionNote> getMedAdmissionNote(String sql){
-		List<MedAdmissionNote> medAdmissionNotes=Lists.newLinkedList();
+	public List<StrAdmissionNote> getMedAdmissionNote(String sql){
+		List<StrAdmissionNote> medAdmissionNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedAdmissionNote medAdmissionNote=new MedAdmissionNote();
+				StrAdmissionNote medAdmissionNote=new StrAdmissionNote();
 				medAdmissionNote.setRecId(rs.getString(""));//记录编号
 				medAdmissionNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medAdmissionNote.setBehospitalCode(rs.getString(""));//病历号
@@ -1048,13 +1048,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedLeaveHospital> getMedLeaveHospital(String sql){
-		List<MedLeaveHospital> medLeaveHospitals=Lists.newLinkedList();
+	public List<StrLeaveHospital> getMedLeaveHospital(String sql){
+		List<StrLeaveHospital> medLeaveHospitals=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedLeaveHospital medLeaveHospital=new MedLeaveHospital();
+				StrLeaveHospital medLeaveHospital=new StrLeaveHospital();
 				medLeaveHospital.setRecId(rs.getString(""));//记录编号
 				medLeaveHospital.setHospitalId(HOSPITAL_ID);//医院ID
 				medLeaveHospital.setBehospitalCode(rs.getString(""));//病历号
@@ -1099,13 +1099,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedCrisisNote> getMedCrisisNote(String sql){
-		List<MedCrisisNote> medCrisisNotes=Lists.newLinkedList();
+	public List<StrCrisisNote> getMedCrisisNote(String sql){
+		List<StrCrisisNote> medCrisisNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedCrisisNote medCrisisNote=new MedCrisisNote();
+				StrCrisisNote medCrisisNote=new StrCrisisNote();
 				medCrisisNote.setRecId(rs.getString(""));//记录编号
 				medCrisisNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medCrisisNote.setBehospitalCode(rs.getString(""));//病历号
@@ -1144,13 +1144,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedOperativeNote> getMedOperativeNote(String sql){
-		List<MedOperativeNote> medOperativeNotes=Lists.newLinkedList();
+	public List<StrOperativeNote> getMedOperativeNote(String sql){
+		List<StrOperativeNote> medOperativeNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedOperativeNote medOperativeNote=new MedOperativeNote();
+				StrOperativeNote medOperativeNote=new StrOperativeNote();
 				medOperativeNote.setRecId(rs.getString(""));//记录编号
 				medOperativeNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medOperativeNote.setBehospitalCode(rs.getString(""));//病历号
@@ -1205,13 +1205,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedRescueNote> getMedRescueNote(String sql){
-		List<MedRescueNote> medRescueNotes=Lists.newLinkedList();
+	public List<StrRescueNote> getMedRescueNote(String sql){
+		List<StrRescueNote> medRescueNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedRescueNote medRescueNote=new MedRescueNote();
+				StrRescueNote medRescueNote=new StrRescueNote();
 				medRescueNote.setRecId(rs.getString(""));//记录编号
 				medRescueNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medRescueNote.setBehospitalCode(rs.getString(""));//病历号
@@ -1252,13 +1252,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedPreoperativeDiscussion> getMedPreoperativeDiscussion(String sql){
-		List<MedPreoperativeDiscussion> medPreoperativeDiscussions=Lists.newLinkedList();
+	public List<StrPreoperativeDiscussion> getMedPreoperativeDiscussion(String sql){
+		List<StrPreoperativeDiscussion> medPreoperativeDiscussions=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedPreoperativeDiscussion medPreoperativeDiscussion=new MedPreoperativeDiscussion();
+				StrPreoperativeDiscussion medPreoperativeDiscussion=new StrPreoperativeDiscussion();
 				medPreoperativeDiscussion.setRecId(rs.getString(""));//记录编号
 				medPreoperativeDiscussion.setHospitalId(HOSPITAL_ID);//医院ID
 				medPreoperativeDiscussion.setBehospitalCode(rs.getString(""));//病历号
@@ -1307,13 +1307,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedOperativeFirstRecord> getMedOperativeFirstRecord(String sql){
-		List<MedOperativeFirstRecord> medOperativeFirstRecords=Lists.newLinkedList();
+	public List<StrOperativeFirstRecord> getMedOperativeFirstRecord(String sql){
+		List<StrOperativeFirstRecord> medOperativeFirstRecords=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedOperativeFirstRecord medOperativeFirstRecord=new MedOperativeFirstRecord();
+				StrOperativeFirstRecord medOperativeFirstRecord=new StrOperativeFirstRecord();
 				medOperativeFirstRecord.setRecId(rs.getString(""));//记录编号
 				medOperativeFirstRecord.setHospitalId(HOSPITAL_ID);//医院ID
 				medOperativeFirstRecord.setBehospitalCode(rs.getString(""));//病历号
@@ -1367,13 +1367,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedWardRecord> getMedWardRecord(String sql){
-		List<MedWardRecord> medWardRecords=Lists.newLinkedList();
+	public List<StrWardRecord> getMedWardRecord(String sql){
+		List<StrWardRecord> medWardRecords=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedWardRecord medWardRecord=new MedWardRecord();
+				StrWardRecord medWardRecord=new StrWardRecord();
 				medWardRecord.setRecId(rs.getString(""));//记录编号
 				medWardRecord.setHospitalId(HOSPITAL_ID);//医院ID
 				medWardRecord.setBehospitalCode(rs.getString(""));//病历号
@@ -1416,13 +1416,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedDeathDiscussion> getMedDeathDiscussion(String sql){
-		List<MedDeathDiscussion> medDeathDiscussions=Lists.newLinkedList();
+	public List<StrDeathDiscussion> getMedDeathDiscussion(String sql){
+		List<StrDeathDiscussion> medDeathDiscussions=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedDeathDiscussion medDeathDiscussion=new MedDeathDiscussion();
+				StrDeathDiscussion medDeathDiscussion=new StrDeathDiscussion();
 				medDeathDiscussion.setRecId(rs.getString(""));//记录编号
 				medDeathDiscussion.setHospitalId(HOSPITAL_ID);//医院ID
 				medDeathDiscussion.setBehospitalCode(rs.getString(""));//病历号
@@ -1469,13 +1469,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedDeathNote> getMedDeathNote(String sql){
-		List<MedDeathNote> medDeathNotes=Lists.newLinkedList();
+	public List<StrDeathNote> getMedDeathNote(String sql){
+		List<StrDeathNote> medDeathNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedDeathNote medDeathNote=new MedDeathNote();
+				StrDeathNote medDeathNote=new StrDeathNote();
 				medDeathNote.setRecId(rs.getString(""));//记录编号
 				medDeathNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medDeathNote.setBehospitalCode(rs.getString(""));//病历号
@@ -1518,13 +1518,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedDifficultCase> getMedDifficultCase(String sql){
-		List<MedDifficultCase> medDifficultCases=Lists.newLinkedList();
+	public List<StrDifficultCase> getMedDifficultCase(String sql){
+		List<StrDifficultCase> medDifficultCases=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedDifficultCase medDifficultCase=new MedDifficultCase();
+				StrDifficultCase medDifficultCase=new StrDifficultCase();
 				medDifficultCase.setRecId(rs.getString(""));//记录编号
 				medDifficultCase.setHospitalId(HOSPITAL_ID);//医院ID
 				medDifficultCase.setBehospitalCode(rs.getString(""));//病历号
@@ -1568,13 +1568,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedIllCritically> getMedIllCritically(String sql){
-		List<MedIllCritically> medIllCriticallies=Lists.newLinkedList();
+	public List<StrIllCritically> getMedIllCritically(String sql){
+		List<StrIllCritically> medIllCriticallies=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedIllCritically medIllCritically=new MedIllCritically();
+				StrIllCritically medIllCritically=new StrIllCritically();
 				medIllCritically.setRecId(rs.getString(""));//记录编号
 				medIllCritically.setHospitalId(HOSPITAL_ID);//医院ID
 				medIllCritically.setBehospitalCode(rs.getString(""));//病历号
@@ -1612,13 +1612,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedIllSeriousl> getMedIllSeriousl(String sql){
-		List<MedIllSeriousl> medIllSeriousls=Lists.newLinkedList();
+	public List<StrIllSeriousl> getMedIllSeriousl(String sql){
+		List<StrIllSeriousl> medIllSeriousls=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedIllSeriousl medIllSeriousl=new MedIllSeriousl();
+				StrIllSeriousl medIllSeriousl=new StrIllSeriousl();
 				medIllSeriousl.setRecId(rs.getString(""));//记录编号
 				medIllSeriousl.setHospitalId(HOSPITAL_ID);//医院ID
 				medIllSeriousl.setBehospitalCode(rs.getString(""));//病历号
@@ -1656,13 +1656,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedTransferInNote> getMedTransferInNote(String sql){
-		List<MedTransferInNote> medTransferInNotes=Lists.newLinkedList();
+	public List<StrTransferInNote> getMedTransferInNote(String sql){
+		List<StrTransferInNote> medTransferInNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedTransferInNote medTransferInNote=new MedTransferInNote();
+				StrTransferInNote medTransferInNote=new StrTransferInNote();
 				medTransferInNote.setRecId(rs.getString(""));//记录编号
 				medTransferInNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medTransferInNote.setBehospitalCode(rs.getString(""));//病历号
@@ -1708,13 +1708,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedTransferOutNote> getMedTransferOutNote(String sql){
-		List<MedTransferOutNote> medTransferOutNotes=Lists.newLinkedList();
+	public List<StrTransferOutNote> getMedTransferOutNote(String sql){
+		List<StrTransferOutNote> medTransferOutNotes=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedTransferOutNote medTransferOutNote=new MedTransferOutNote();
+				StrTransferOutNote medTransferOutNote=new StrTransferOutNote();
 				medTransferOutNote.setRecId(rs.getString(""));//记录编号
 				medTransferOutNote.setHospitalId(HOSPITAL_ID);//医院ID
 				medTransferOutNote.setBehospitalCode(rs.getString(""));//病历号
@@ -1760,13 +1760,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedBloodResult> getMedBloodResult(String sql){
-		List<MedBloodResult> medBloodResults=Lists.newLinkedList();
+	public List<StrBloodResult> getMedBloodResult(String sql){
+		List<StrBloodResult> medBloodResults=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedBloodResult medBloodResult=new MedBloodResult();
+				StrBloodResult medBloodResult=new StrBloodResult();
 				medBloodResult.setRecId(rs.getString(""));//记录编号
 				medBloodResult.setHospitalId(HOSPITAL_ID);//医院ID
 				medBloodResult.setBehospitalCode(rs.getString(""));//病历号
@@ -1803,13 +1803,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedBloodTransfusion> getMedBloodTransfusion(String sql){
-		List<MedBloodTransfusion> medBloodTransfusions=Lists.newLinkedList();
+	public List<StrBloodTransfusion> getMedBloodTransfusion(String sql){
+		List<StrBloodTransfusion> medBloodTransfusions=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedBloodTransfusion medBloodTransfusion=new MedBloodTransfusion();
+				StrBloodTransfusion medBloodTransfusion=new StrBloodTransfusion();
 				medBloodTransfusion.setRecId(rs.getString(""));//记录编号
 				medBloodTransfusion.setHospitalId(HOSPITAL_ID);//医院ID
 				medBloodTransfusion.setBehospitalCode(rs.getString(""));//病历号
@@ -1850,13 +1850,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedPeriodConclusion> getMedPeriodConclusion(String sql){
-		List<MedPeriodConclusion> medPeriodConclusions=Lists.newLinkedList();
+	public List<StrPeriodConclusion> getMedPeriodConclusion(String sql){
+		List<StrPeriodConclusion> medPeriodConclusions=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedPeriodConclusion medPeriodConclusion=new MedPeriodConclusion();
+				StrPeriodConclusion medPeriodConclusion=new StrPeriodConclusion();
 				medPeriodConclusion.setRecId(rs.getString(""));//记录编号
 				medPeriodConclusion.setHospitalId(HOSPITAL_ID);//医院ID
 				medPeriodConclusion.setBehospitalCode(rs.getString(""));//病历号
@@ -1900,13 +1900,13 @@ public class FJTZDBConn {
 	 * @param sql
 	 * @return
 	 */
-	public List<MedFirstRecord> getMedFirstRecord(String sql){
-		List<MedFirstRecord> medFirstRecords=Lists.newLinkedList();
+	public List<StrFirstRecord> getMedFirstRecord(String sql){
+		List<StrFirstRecord> medFirstRecords=Lists.newLinkedList();
 		try {
 			FJTZDBConn dbconn=new FJTZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				MedFirstRecord medFirstRecord=new MedFirstRecord();
+				StrFirstRecord medFirstRecord=new StrFirstRecord();
 				medFirstRecord.setRecId(rs.getString(""));//记录编号
 				medFirstRecord.setHospitalId(HOSPITAL_ID);//医院ID
 				medFirstRecord.setBehospitalCode(rs.getString(""));//病历号