对外接口调整

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

@@ -189,6 +189,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data_str/sendPreoperativeDiscussion").permitAll()
                 .antMatchers("/qc/data_str/sendTalkInform").permitAll()
                 .antMatchers("/qc/data_str/sendInformedConsent").permitAll()
+                .antMatchers("/qc/data_str/sendContent").permitAll()
                 .antMatchers("/qc/doctoradvice/getPage").permitAll()
                 .antMatchers("/qc/medPacsInfo/getCheckPage").permitAll()
                 .antMatchers("/qc/medLisInfo/getExaminePage").permitAll()

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

@@ -233,6 +233,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data_str/sendPreoperativeDiscussion", request)
                 || matchers("/qc/data_str/sendTalkInform", request)
                 || matchers("/qc/data_str/sendInformedConsent", request)
+                || matchers("/qc/data_str/sendContent", request)
                 || matchers("/qc/doctoradvice/getPage", request)
                 || matchers("/qc/medPacsInfo/getCheckPage", request)
                 || matchers("/qc/medLisInfo/getExaminePage", request)

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

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

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -103,12 +103,12 @@ public class MedPacsInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -239,18 +239,18 @@ public class MedPacsInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

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

@@ -1,16 +1,12 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.BasDeptInfoDTO;
 import com.diagbot.entity.*;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.BasDeptInfoVO;
 import com.diagbot.vo.data.BasDoctorInfoVO;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -70,7 +66,7 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                 QueryWrapper<BehospitalInfo> QueryWrapper = new QueryWrapper<>();
                 QueryWrapper.eq("hospital_id",basDoctorInfoVO.getHospitalId());
                 QueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-                QueryWrapper.eq("is_placefile", basDoctorInfoVO.getIsPlacefile());
+                //QueryWrapper.eq("is_placefile", basDoctorInfoVO.getIsPlacefile());
                 QueryWrapper.in("beh_dept_id",deptSetInfo);
 
                 if(StringUtils.isNotEmpty(basDoctorInfoVO.getInputStr())){

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

@@ -12,6 +12,7 @@ import com.diagbot.vo.data.ABasDeptInfoVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -25,6 +26,8 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
     private BasDeptInfoServiceImpl basDeptInfoService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -52,54 +55,59 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
      * @return
      */
     public RespDTO<List<ABasDeptInfoDTO>> executeDept(List<ABasDeptInfoVO> list) {
-        if(list!=null && list.size()>0){
-            List<BasDeptInfo> basDeptInfoList=Lists.newArrayList();
-            List<ABasDeptInfoDTO> basDeptInfoDtoList=Lists.newArrayList();
-            basDeptInfoList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
-            basDeptInfoDtoList=BeanUtil.listCopyTo(list,ABasDeptInfoDTO.class);
+        try{
+            if(list!=null && list.size()>0){
+                List<BasDeptInfo> basDeptInfoList=Lists.newArrayList();
+                basDeptInfoList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+
+                //循环验证数据有效性
+                for (BasDeptInfo basDeptInfo:basDeptInfoList) {
+                    if("".equals(basDeptInfo.getDeptId())) {
+                        return RespDTO.onError("请输入科室编码!");
+                    }else if(basDeptInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(basDeptInfo.getDeptName())){
+                        return RespDTO.onError("请输入科室名称!");
+                    }
+                }
+                execute(basDeptInfoList);
 
-            //循环验证数据有效性
-            for (BasDeptInfo basDeptInfo:basDeptInfoList) {
-                if("".equals(basDeptInfo.getDeptId())) {
-                    return RespDTO.onError("请输入科室编码!");
-                }else if(basDeptInfo.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(basDeptInfo.getDeptName())){
-                    return RespDTO.onError("请输入科室名称!");
+                if(logSwitch){
+                    basDeptInfoList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息-正常","", JSON.toJSONString(list),"","");
+                    });
                 }
+                return RespDTO.onSuc("操作正常！");
+            }else {
+                return RespDTO.onError("未接收到数据!");
             }
-            execute(basDeptInfoList);
-            return RespDTO.onSuc(basDeptInfoDtoList);
-        }else {
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息-异常","", JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
 
     public void execute(List<BasDeptInfo> basDeptInfoList){
-        try{
-            List<BasDeptInfo> addE=Lists.newArrayList();
-            List<BasDeptInfo> updateE=Lists.newArrayList();
-            basDeptInfoList.stream().forEach(s -> {
-                BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
-                        .eq("dept_id", s.getDeptId())
-                        .eq("hospital_id", s.getHospitalId()), false);
-                if (basDeptInfo != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-            if(updateE.size()>0){
-                basDeptInfoService.updateBatchByKey(updateE);
-            }
-            if(addE.size()>0){
-                basDeptInfoService.saveBatch(addE);
+        List<BasDeptInfo> addE=Lists.newArrayList();
+        List<BasDeptInfo> updateE=Lists.newArrayList();
+        basDeptInfoList.stream().forEach(s -> {
+            BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
+                    .eq("dept_id", s.getDeptId())
+                    .eq("hospital_id", s.getHospitalId()), false);
+            if (basDeptInfo != null) {
+                s.setGmtModified(new Date());
+                updateE.add(s);
+            } else {
+                s.setGmtCreate(new Date());
+                addE.add(s);
             }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息","", JSON.toJSONString(basDeptInfoList),"",e.getMessage());
+        });
+        if(updateE.size()>0){
+            basDeptInfoService.updateBatchByKey(updateE);
+        }
+        if(addE.size()>0){
+            basDeptInfoService.saveBatch(addE);
         }
     }
 }

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

@@ -12,6 +12,7 @@ import com.diagbot.vo.data.ABasDoctorInfoVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -24,7 +25,8 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     private BasDoctorInfoServiceImpl basDoctorInfoService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -50,51 +52,56 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
      * @return
      */
     public RespDTO<List<ABasDoctorInfoDTO>> executeDoctor(List<ABasDoctorInfoVO> list) {
-        if(list!=null && list.size()>0){
-            List<BasDoctorInfo> basDoctorInfoList=Lists.newArrayList();
-            List<ABasDoctorInfoDTO> basDoctorDtoList=Lists.newArrayList();
-            basDoctorInfoList=BeanUtil.listCopyTo(list,BasDoctorInfo.class);
-            basDoctorDtoList=BeanUtil.listCopyTo(list,ABasDoctorInfoDTO.class);
-            //循环验证数据有效性
-            for (BasDoctorInfo basDoctorInfo:basDoctorInfoList) {
-                if("".equals(basDoctorInfo.getDoctorId())) {
-                    return RespDTO.onError("请输入医生编码!");
-                }else if(basDoctorInfo.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
+        try {
+            if(list!=null && list.size()>0){
+                List<BasDoctorInfo> basDoctorInfoList=Lists.newArrayList();
+                basDoctorInfoList=BeanUtil.listCopyTo(list,BasDoctorInfo.class);
+                //循环验证数据有效性
+                for (BasDoctorInfo basDoctorInfo:basDoctorInfoList) {
+                    if("".equals(basDoctorInfo.getDoctorId())) {
+                        return RespDTO.onError("请输入医生编码!");
+                    }else if(basDoctorInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }
+                }
+                execute(basDoctorInfoList);
+
+                if(logSwitch){
+                    basDoctorInfoList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息-正常","", JSON.toJSONString(list),"","");
+                    });
                 }
+                return RespDTO.onSuc("操作正常！");
+            }else{
+                return RespDTO.onError("未接收到数据!");
             }
-            execute(basDoctorInfoList);
-            return RespDTO.onSuc(basDoctorDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息-异常","", JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
 
     public void execute(List<BasDoctorInfo> basDoctorInfoList){
-        try {
-            List<BasDoctorInfo> addE=Lists.newArrayList();
-            List<BasDoctorInfo> updateE=Lists.newArrayList();
-            basDoctorInfoList.stream().forEach(s -> {
-                BasDoctorInfo basDoctorInfo =this.baseMapper.selectOne(new QueryWrapper<BasDoctorInfo>()
-                        .eq("doctor_id", s.getDoctorId())
-                        .eq("hospital_id", s.getHospitalId()));
-                if (basDoctorInfo != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-            if(updateE.size()>0){
-                basDoctorInfoService.updateBatchByKey(updateE);
-            }
-            if(addE.size()>0){
-                basDoctorInfoService.saveBatch(addE);
+        List<BasDoctorInfo> addE=Lists.newArrayList();
+        List<BasDoctorInfo> updateE=Lists.newArrayList();
+        basDoctorInfoList.stream().forEach(s -> {
+            BasDoctorInfo basDoctorInfo =this.baseMapper.selectOne(new QueryWrapper<BasDoctorInfo>()
+                    .eq("doctor_id", s.getDoctorId())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (basDoctorInfo != null) {
+                s.setGmtModified(new Date());
+                updateE.add(s);
+            } else {
+                s.setGmtCreate(new Date());
+                addE.add(s);
             }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息","", JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
+        });
+        if(updateE.size()>0){
+            basDoctorInfoService.updateBatchByKey(updateE);
+        }
+        if(addE.size()>0){
+            basDoctorInfoService.saveBatch(addE);
         }
     }
 }

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

@@ -22,6 +22,7 @@ import com.diagbot.vo.data.APlaceFileVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -40,6 +41,8 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private QcAbnormalFacade qcAbnormalFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -69,76 +72,80 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @return
      */
     public RespDTO<List<ABehospitalInfoDTO>> executeBehospital(List<ABehospitalInfoVO> list) {
-        if(list!=null && list.size()>0) {
-            List<BehospitalInfo> behospitalInfoList = Lists.newArrayList();
-            List<ABehospitalInfoDTO> behospitalInfoDtoList = Lists.newArrayList();
-            list.stream().forEach(s->{
-                BehospitalInfo behospitalInfo=new BehospitalInfo();
-                BeanUtil.copyProperties(s,behospitalInfo);
-                if(StringUtil.isNotBlank(s.getBirthday())) {
-                    behospitalInfo.setBirthday(DateUtil.parseDate(s.getBirthday()));
-                }
-                if(StringUtil.isNotBlank(s.getLeaveHospitalDate())) {
-                    behospitalInfo.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
-                }
-                if(StringUtil.isNotBlank(s.getBehospitalDate())){
-                    behospitalInfo.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
-                }
-                if(StringUtil.isNotBlank(s.getPlacefileDate())){
-                    behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(s.getPlacefileDate()));
+        try {
+            if(list!=null && list.size()>0) {
+                List<BehospitalInfo> behospitalInfoList = Lists.newArrayList();
+                list.stream().forEach(s->{
+                    BehospitalInfo behospitalInfo=new BehospitalInfo();
+                    BeanUtil.copyProperties(s,behospitalInfo);
+                    if(StringUtil.isNotBlank(s.getBirthday())) {
+                        behospitalInfo.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                    }
+                    if(StringUtil.isNotBlank(s.getLeaveHospitalDate())) {
+                        behospitalInfo.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
+                    }
+                    if(StringUtil.isNotBlank(s.getBehospitalDate())){
+                        behospitalInfo.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
+                    }
+                    if(StringUtil.isNotBlank(s.getPlacefileDate())){
+                        behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(s.getPlacefileDate()));
+                    }
+                    behospitalInfoList.add(behospitalInfo);
+
+                });
+
+                //循环验证数据有效性
+                for (BehospitalInfo behospitalInfo:behospitalInfoList) {
+                    if("".equals(behospitalInfo.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }else if(behospitalInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(behospitalInfo.getBehDeptId())){
+                        return RespDTO.onError("请输入住院科室编码!");
+                    }else if("".equals(behospitalInfo.getBehDeptName())){
+                        return RespDTO.onError("请输入住院科室名称!");
+                    }
                 }
-                behospitalInfoList.add(behospitalInfo);
-
-            });
-
-            //循环验证数据有效性
-            for (BehospitalInfo behospitalInfo:behospitalInfoList) {
-                if("".equals(behospitalInfo.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                }else if(behospitalInfo.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(behospitalInfo.getBehDeptId())){
-                    return RespDTO.onError("请输入住院科室编码!");
-                }else if("".equals(behospitalInfo.getBehDeptName())){
-                    return RespDTO.onError("请输入住院科室名称!");
+                execute(behospitalInfoList);
+                if(logSwitch){
+                    behospitalInfoList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-正常","", JSON.toJSONString(list),"","");
+                    });
                 }
+                return RespDTO.onSuc("操作正常！");
+            }else{
+                return RespDTO.onError("未接收到数据!");
             }
-            execute(behospitalInfoList);
-            behospitalInfoDtoList = BeanUtil.listCopyTo(list, ABehospitalInfoDTO.class);
-            return RespDTO.onSuc(behospitalInfoDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-异常","", JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
 
     public void execute(List<BehospitalInfo> behospitalInfoList){
-        try {
-            List<BehospitalInfo> addE = Lists.newLinkedList();
-            List<BehospitalInfo> updateE = Lists.newLinkedList();
-            behospitalInfoList.stream().forEach(s -> {
-                BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
-                        .eq("behospital_code", s.getBehospitalCode())
-                        .eq("hospital_id", s.getHospitalId())
-                        .eq("is_deleted",IsDeleteEnum.N), false);
-                if (behospitalInfo != null) {
-                    s.setGmtModified(new Date());
-                    s.setQcTypeId(initQcTypeId(s));
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    s.setQcTypeId(initQcTypeId(s));
-                    addE.add(s);
-                }
-            });
-            if(addE.size()>0){
-                behospitalInfoService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                behospitalInfoService.updateBatchByKey(updateE);
+        List<BehospitalInfo> addE = Lists.newLinkedList();
+        List<BehospitalInfo> updateE = Lists.newLinkedList();
+        behospitalInfoList.stream().forEach(s -> {
+            BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N), false);
+            if (behospitalInfo != null) {
+                s.setGmtModified(new Date());
+                s.setQcTypeId(initQcTypeId(s));
+                updateE.add(s);
+            } else {
+                s.setGmtCreate(new Date());
+                s.setQcTypeId(initQcTypeId(s));
+                addE.add(s);
             }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记","", JSON.toJSONString(behospitalInfoList),"",e.getMessage());
+        });
+        if(addE.size()>0){
+            behospitalInfoService.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            behospitalInfoService.updateBatchByKey(updateE);
         }
     }
 

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.ADoctorAdviceDTO;
 import com.diagbot.entity.DoctorAdvice;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
@@ -17,6 +16,7 @@ import com.diagbot.vo.data.ADoctorAdviceVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -30,6 +30,8 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     private DoctorAdviceServiceImpl doctorAdviceService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -53,68 +55,72 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
      * @param list
      * @return
      */
-    public RespDTO<List<ADoctorAdviceDTO>> executeDoctorAdvice(List<ADoctorAdviceVO> list) {
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (ADoctorAdviceVO doctorAdvice:list) {
-                if("".equals(doctorAdvice.getDoctorAdviceId())) {
-                    return RespDTO.onError("请输入病人医嘱编码!");
-                }else if(doctorAdvice.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(doctorAdvice.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<DoctorAdvice> doctorAdviceList=Lists.newArrayList();
-            List<ADoctorAdviceDTO> doctorAdviceDtoList=Lists.newArrayList();
-            list.stream().forEach(s->{
-                DoctorAdvice doctorAdvice=new DoctorAdvice();
-                BeanUtil.copyProperties(s,doctorAdvice);
-                if(StringUtil.isNotBlank(s.getDaStartDate())){
-                    doctorAdvice.setDaStartDate(DateUtil.parseDateTime(s.getDaStartDate()));
-                }
-                if(StringUtil.isNotBlank(s.getDaStopDate())){
-                    doctorAdvice.setDaStopDate(DateUtil.parseDateTime(s.getDaStopDate()));
-                }
-                doctorAdviceList.add(doctorAdvice);
-            });
-            execute(doctorAdviceList);
-            doctorAdviceDtoList=BeanUtil.listCopyTo(list,ADoctorAdviceDTO.class);
-            return RespDTO.onSuc(doctorAdviceDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<DoctorAdvice> doctorAdviceList){
+    public RespDTO executeDoctorAdvice(List<ADoctorAdviceVO> list) {
         try {
-            List<DoctorAdvice> addE = Lists.newLinkedList();
-            List<DoctorAdvice> updateE = Lists.newLinkedList();
-            if (doctorAdviceList != null && doctorAdviceList.size() > 0) {
-                doctorAdviceList.stream().forEach(s -> {
-                    DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
-                            .eq("doctor_advice_id", s.getDoctorAdviceId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (doctorAdvice != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (ADoctorAdviceVO doctorAdvice:list) {
+                    if("".equals(doctorAdvice.getDoctorAdviceId())) {
+                        return RespDTO.onError("请输入病人医嘱编码!");
+                    }else if(doctorAdvice.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(doctorAdvice.getBehospitalCode())){
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
+                }
+                //初始、格式化数据
+                List<DoctorAdvice> doctorAdviceList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    DoctorAdvice doctorAdvice=new DoctorAdvice();
+                    BeanUtil.copyProperties(s,doctorAdvice);
+                    if(StringUtil.isNotBlank(s.getDaStartDate())){
+                        doctorAdvice.setDaStartDate(DateUtil.parseDateTime(s.getDaStartDate()));
+                    }
+                    if(StringUtil.isNotBlank(s.getDaStopDate())){
+                        doctorAdvice.setDaStopDate(DateUtil.parseDateTime(s.getDaStopDate()));
                     }
+                    doctorAdviceList.add(doctorAdvice);
                 });
-            }
-            if(addE.size()>0){
-                doctorAdviceService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                doctorAdviceService.updateBatchByKey(updateE);
+                execute(doctorAdviceList);
+                if(logSwitch){
+                    doctorAdviceList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常！");
+            }else{
+                return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("医嘱信息","", JSON.toJSONString(doctorAdviceList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-异常","", JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
+        }
+    }
+
+    public void execute(List<DoctorAdvice> doctorAdviceList){
+        List<DoctorAdvice> addE = Lists.newLinkedList();
+        List<DoctorAdvice> updateE = Lists.newLinkedList();
+        if (doctorAdviceList != null && doctorAdviceList.size() > 0) {
+            doctorAdviceList.stream().forEach(s -> {
+                DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
+                        .eq("doctor_advice_id", s.getDoctorAdviceId())
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("behospital_code",s.getBehospitalCode()), false);
+                if (doctorAdvice != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+        }
+        if(addE.size()>0){
+            doctorAdviceService.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            doctorAdviceService.updateBatchByKey(updateE);
         }
     }
 

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

@@ -17,6 +17,7 @@ import com.diagbot.vo.data.AHomeDiagnoseVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +29,10 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     @Autowired
     @Qualifier("homeDiagnoseInfoServiceImpl")
     private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoService;
-
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -51,49 +53,53 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
      * @return
      */
     public RespDTO<List<AHomeDiagnoseDTO>> executeHomeDiagnose(List<AHomeDiagnoseVO> list) {
-        if(list!=null && list.size()>0){
-            List<HomeDiagnoseInfo> homeDiagnoseList=Lists.newArrayList();
-            List<AHomeDiagnoseDTO> homeDiagnoseDtoList=Lists.newArrayList();
-
-            homeDiagnoseList=BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
-            homeDiagnoseDtoList=BeanUtil.listCopyTo(list,AHomeDiagnoseDTO.class);
-            execute(homeDiagnoseList);
-            return RespDTO.onSuc(homeDiagnoseDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        try{
+            if(list!=null && list.size()>0){
+                List<HomeDiagnoseInfo> homeDiagnoseList=Lists.newArrayList();
+                homeDiagnoseList=BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
+                execute(homeDiagnoseList);
+                if(logSwitch){
+                    homeDiagnoseList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页医嘱-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常！");
+            }else{
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页医嘱-异常","", JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
         }
+
     }
 
     public void execute(List<HomeDiagnoseInfo> homeDiagnoseList){
-        try{
-            List<HomeDiagnoseInfo> addE = Lists.newLinkedList();
-            List<HomeDiagnoseInfo> updateE = Lists.newLinkedList();
-            if (homeDiagnoseList != null && homeDiagnoseList.size() > 0) {
-                homeDiagnoseList.stream().forEach(s -> {
-                    if(s.getHomePageId()!=null && !"".equals(s.getDiagnoseOrderNo())){
-                        HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
-                                .eq("home_page_id", s.getHomePageId())
-                                .eq("hospital_id", s.getHospitalId())
-                                .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
-                        if (diagnoseInfo != null) {
-                            s.setGmtModified(new Date());
-                            updateE.add(s);
-                        } else {
-                            s.setGmtCreate(new Date());
-                            addE.add(s);
-                        }
+        List<HomeDiagnoseInfo> addE = Lists.newLinkedList();
+        List<HomeDiagnoseInfo> updateE = Lists.newLinkedList();
+        if (homeDiagnoseList != null && homeDiagnoseList.size() > 0) {
+            homeDiagnoseList.stream().forEach(s -> {
+                if(s.getHomePageId()!=null && !"".equals(s.getDiagnoseOrderNo())){
+                    HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
+                            .eq("home_page_id", s.getHomePageId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
+                    if (diagnoseInfo != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
                     }
-                });
-            }
-            if(addE.size()>0){
-                homeDiagnoseInfoService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                homeDiagnoseInfoService.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-医嘱","", JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
+                }
+            });
+        }
+        if(addE.size()>0){
+            homeDiagnoseInfoService.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            homeDiagnoseInfoService.updateBatchByKey(updateE);
         }
     }
 

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

@@ -17,6 +17,7 @@ import com.diagbot.vo.data.AHomeOperationVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -30,6 +31,8 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     private HomeOperationInfoServiceImpl homeOperationInfoService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -49,53 +52,61 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
      * @param list
      * @return
      */
-    public List<AHomeOperationDTO> executeHomeOperation(List<AHomeOperationVO> list) {
-        List<HomeOperationInfo> homeOperationList=Lists.newArrayList();
-        List<AHomeOperationDTO> homeOperationDtoList=Lists.newArrayList();
-        if(list!=null && list.size()>0){
-            list.stream().forEach(s->{
-                HomeOperationInfo homeOperationInfo=new HomeOperationInfo();
-                BeanUtil.copyProperties(s,homeOperationInfo);
-                homeOperationInfo.setOperationDate(DateUtil.parseDateTime(s.getOperationDate()));
-                homeOperationList.add(homeOperationInfo);
-            });
-            homeOperationDtoList=BeanUtil.listCopyTo(list,AHomeOperationDTO.class);
-            execute(homeOperationList);
-        }
-        return homeOperationDtoList;
-    }
-
-    public void execute(List<HomeOperationInfo> homeOperationList){
+    public RespDTO executeHomeOperation(List<AHomeOperationVO> list) {
         try {
-            List<HomeOperationInfo> addE = Lists.newLinkedList();
-            List<HomeOperationInfo> updateE = Lists.newLinkedList();
-            if (homeOperationList != null && homeOperationList.size() > 0) {
-                homeOperationList.stream().forEach(s -> {
-                    if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
-                        QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("home_page_id", s.getHomePageId());
-                        queryWrapper.eq("hospital_id", s.getHospitalId());
-                        queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
-                        HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
-                        if (operationInfo != null) {
-                            s.setGmtModified(new Date());
-                            updateE.add(s);
-                        } else {
-                            s.setGmtCreate(new Date());
-                            addE.add(s);
-                        }
-                    }
+            List<HomeOperationInfo> homeOperationList=Lists.newArrayList();
+            List<AHomeOperationDTO> homeOperationDtoList=Lists.newArrayList();
+            if(list!=null && list.size()>0){
+                list.stream().forEach(s->{
+                    HomeOperationInfo homeOperationInfo=new HomeOperationInfo();
+                    BeanUtil.copyProperties(s,homeOperationInfo);
+                    homeOperationInfo.setOperationDate(DateUtil.parseDateTime(s.getOperationDate()));
+                    homeOperationList.add(homeOperationInfo);
                 });
-            }
-            if(addE.size()>0){
-                homeOperationInfoService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                homeOperationInfoService.updateBatchByKey(updateE);
+                homeOperationDtoList=BeanUtil.listCopyTo(list,AHomeOperationDTO.class);
+                execute(homeOperationList);
+                if(logSwitch){
+                    homeOperationList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页手术-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常！");
+            }else{
+                return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术","",JSON.toJSONString(homeOperationList),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页手术-异常","",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
+        }
+    }
+
+    public void execute(List<HomeOperationInfo> homeOperationList){
+        List<HomeOperationInfo> addE = Lists.newLinkedList();
+        List<HomeOperationInfo> updateE = Lists.newLinkedList();
+        if (homeOperationList != null && homeOperationList.size() > 0) {
+            homeOperationList.stream().forEach(s -> {
+                if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
+                    QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("home_page_id", s.getHomePageId());
+                    queryWrapper.eq("hospital_id", s.getHospitalId());
+                    queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
+                    HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
+                    if (operationInfo != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                }
+            });
+        }
+        if(addE.size()>0){
+            homeOperationInfoService.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            homeOperationInfoService.updateBatchByKey(updateE);
         }
     }
 

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

@@ -16,6 +16,7 @@ import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -45,6 +46,9 @@ public class AHomePageFacade extends HomePageServiceImpl{
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**

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

@@ -12,6 +12,7 @@ import com.diagbot.vo.data.AMedCrisisVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -25,36 +26,48 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
     private MedCrisisInfoServiceImpl medCrisisInfoService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     public RespDTO<List<AMedCrisisDTO>> executeMedCrisis(List<AMedCrisisVO> list) {
-        if (list != null && list.size() > 0) {
-            //循环验证数据有效性
-            for (AMedCrisisVO aMedCrisisVO : list) {
-                if ("".equals(aMedCrisisVO.getRecId())) {
-                    return RespDTO.onError("请输入文书编码!");
-                } else if ("".equals(aMedCrisisVO.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                } else if (aMedCrisisVO.getHospitalId() == null) {
-                    return RespDTO.onError("请输入医院编码!");
-                } else if ("".equals(aMedCrisisVO.getRecType())) {
-                    return RespDTO.onError("请输入危急值类型!");
+        try{
+            if (list != null && list.size() > 0) {
+                //循环验证数据有效性
+                for (AMedCrisisVO aMedCrisisVO : list) {
+                    if ("".equals(aMedCrisisVO.getRecId())) {
+                        return RespDTO.onError("请输入文书编码!");
+                    } else if ("".equals(aMedCrisisVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    } else if (aMedCrisisVO.getHospitalId() == null) {
+                        return RespDTO.onError("请输入医院编码!");
+                    } else if ("".equals(aMedCrisisVO.getRecType())) {
+                        return RespDTO.onError("请输入危急值类型!");
+                    }
                 }
-            }
 
-            List<MedCrisisInfo> medCrisisList = Lists.newArrayList();
-            list.stream().forEach(s -> {
-                MedCrisisInfo medCrisisInfo = new MedCrisisInfo();
-                BeanUtil.copyProperties(s, medCrisisInfo);
-                medCrisisInfo.setRepDate(DateUtil.parseDateTime(s.getRepDate()));
-                medCrisisInfo.setSendDate(DateUtil.parseDateTime(s.getSendDate()));
-                medCrisisList.add(medCrisisInfo);
-            });
-            execute(medCrisisList);
+                List<MedCrisisInfo> medCrisisList = Lists.newArrayList();
+                list.stream().forEach(s -> {
+                    MedCrisisInfo medCrisisInfo = new MedCrisisInfo();
+                    BeanUtil.copyProperties(s, medCrisisInfo);
+                    medCrisisInfo.setRepDate(DateUtil.parseDateTime(s.getRepDate()));
+                    medCrisisInfo.setSendDate(DateUtil.parseDateTime(s.getSendDate()));
+                    medCrisisList.add(medCrisisInfo);
+                });
+                execute(medCrisisList);
 
-            List<AMedCrisisDTO> medCrisisDtoList = BeanUtil.listCopyTo(list, AMedCrisisDTO.class);
-            return RespDTO.onSuc(medCrisisDtoList);
-        } else {
-            return RespDTO.onError("未接收到数据!");
+                if(logSwitch){
+                    medCrisisList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("危急值信息-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常！");
+            } else {
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值信息-异常","", JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
 

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

@@ -0,0 +1,122 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedLisInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.MedLisInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.AMedLisInfoVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AMedLisInfoFacade extends MedLisInfoServiceImpl {
+
+    private TZDBConn tzDBConn = new TZDBConn();
+    @Autowired
+    @Qualifier("medLisInfoServiceImpl")
+    private MedLisInfoServiceImpl medLisInfoServiceImpl;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
+
+    public RespDTO  dealData(List<AMedLisInfoVO> list) {
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AMedLisInfoVO aMedLisInfoVO:list) {
+                    if(StringUtil.isEmpty(aMedLisInfoVO.getRepNo())){
+                        return RespDTO.onError("请输入报告单号!");
+                    }else if(aMedLisInfoVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(aMedLisInfoVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
+                }
+
+                List<MedLisInfo> medLisInfoList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedLisInfo medLisInfo=new MedLisInfo();
+                    BeanUtil.copyProperties(s,medLisInfo);
+                    medLisInfoList.add(medLisInfo);
+                });
+                execute(medLisInfoList);
+                if(logSwitch){
+                    medLisInfoList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("检验信息-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常!");
+            }else{
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验信息-异常","",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+    
+    public void execute(List<MedLisInfo> medLisInfoList){
+        List<MedLisInfo> addE = Lists.newLinkedList();
+        List<MedLisInfo> updateE = Lists.newLinkedList();
+        if (medLisInfoList != null && medLisInfoList.size() > 0) {
+            medLisInfoList.stream().forEach(s -> {
+                MedLisInfo medLisInfo = this.getOne(new QueryWrapper<MedLisInfo>()
+                        .eq("rep_no", s.getRepNo())
+                        .eq("hospital_id", s.getHospitalId()), false);
+                if (medLisInfo != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+        }
+        if(addE.size()>0){
+            medLisInfoServiceImpl.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            this.baseMapper.updateBatchByKey(updateE);
+        }
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getRepNo())){
+                return RespDTO.onError("请输入报告单号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedLisInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getRepNo())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedLisInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("检查-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查信息-删除异常",aDeleteFlagVO.getRecId(), JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+}

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

@@ -15,6 +15,7 @@ import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedLisResultVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -24,7 +25,8 @@ import java.util.List;
 public class AMedLisResultFacade extends MedLisResultServiceImpl {
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -38,7 +40,7 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
         execute(medLisResultList);
     }
 
-    public RespDTO<List<AMedLisResultVO>> executeMedLisResult(List<AMedLisResultVO> list) {
+    public RespDTO executeMedLisResult(List<AMedLisResultVO> list) {
         try {
             if(list!=null && list.size()>0){
                 //循环验证数据有效性
@@ -59,58 +61,56 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
                     medLisResultList.add(medLisResult);
                 });
                 execute(medLisResultList);
-
-                return RespDTO.onSuc(list);
+                if(logSwitch){
+                    medLisResultList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("检验结果-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常！");
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo("检验","",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检验","",JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验结果-异常","",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<MedLisResult> medLisResultList){
-        try {
-            List<MedLisResult> addE = Lists.newLinkedList();
-            List<MedLisResult> updateE = Lists.newLinkedList();
-            if (medLisResultList != null && medLisResultList.size() > 0) {
-                medLisResultList.stream().forEach(s -> {
-                    MedLisResult medLisResult = this.getOne(new QueryWrapper<MedLisResult>()
-                            .eq("rep_no", s.getRepNo())
-                            .eq("hospital_id", s.getHospitalId()), false);
-                    if (medLisResult != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                this.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-            //aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(medLisResultList),"","操作成功!");
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检验","",JSON.toJSONString(medLisResultList),"",e.getMessage());
+        List<MedLisResult> addE = Lists.newLinkedList();
+        List<MedLisResult> updateE = Lists.newLinkedList();
+        if (medLisResultList != null && medLisResultList.size() > 0) {
+            medLisResultList.stream().forEach(s -> {
+                MedLisResult medLisResult = this.getOne(new QueryWrapper<MedLisResult>()
+                        .eq("rep_no", s.getRepNo())
+                        .eq("hospital_id", s.getHospitalId()), false);
+                if (medLisResult != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+        }
+        if(addE.size()>0){
+            this.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            this.baseMapper.updateBatchByKey(updateE);
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isEmpty(aDeleteFlagVO.getReptNo())){
+            if(StringUtil.isEmpty(aDeleteFlagVO.getRepNo())){
                 return RespDTO.onError("请输入报告单号!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
             }else {
                 UpdateWrapper<MedLisResult> updateWrapper=new UpdateWrapper<>();
-                updateWrapper.eq("rep_no", aDeleteFlagVO.getReptNo())
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getRepNo())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
                         .eq("is_deleted",IsDeleteEnum.N)
                         .set("is_deleted",IsDeleteEnum.Y)

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

@@ -0,0 +1,124 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedPacsInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.MedPacsInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.AMedPacsInfoVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AMedPacsInfoFacade extends MedPacsInfoServiceImpl {
+    private TZDBConn tzDBConn = new TZDBConn();
+
+    @Autowired
+    @Qualifier("medPacsInfoServiceImpl")
+    private MedPacsInfoServiceImpl medPacsInfoServiceImpl;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
+
+    
+    public RespDTO dealData(List<AMedPacsInfoVO> list) {
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AMedPacsInfoVO aMedPacsInfoVO:list) {
+                    if(StringUtil.isEmpty(aMedPacsInfoVO.getRepNo())){
+                        return RespDTO.onError("请输入报告单号!");
+                    }else if(aMedPacsInfoVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(aMedPacsInfoVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
+                }
+
+                List<MedPacsInfo> medPacsInfoList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedPacsInfo medPacsInfo=new MedPacsInfo();
+                    BeanUtil.copyProperties(s,medPacsInfo);
+                    medPacsInfoList.add(medPacsInfo);
+                });
+                execute(medPacsInfoList);
+
+                if(logSwitch){
+                    medPacsInfoList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("检查信息-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常！");
+            }else{
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查信息-异常","",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+    
+    public void execute(List<MedPacsInfo> medPacsInfoList){
+        List<MedPacsInfo> addE = Lists.newLinkedList();
+        List<MedPacsInfo> updateE = Lists.newLinkedList();
+        if (medPacsInfoList != null && medPacsInfoList.size() > 0) {
+            medPacsInfoList.stream().forEach(s -> {
+                MedPacsInfo medPacsInfo = this.getOne(new QueryWrapper<MedPacsInfo>()
+                        .eq("rep_no", s.getRepNo())
+                        .eq("hospital_id", s.getHospitalId()), false);
+                if (medPacsInfo != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+        }
+        if(addE.size()>0){
+            medPacsInfoServiceImpl.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            this.baseMapper.updateBatchByKey(updateE);
+        }
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getRepNo())){
+                return RespDTO.onError("请输入报告单号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedPacsInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getRepNo())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedPacsInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("检查-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查信息-删除异常",aDeleteFlagVO.getRecId(), JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+}

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

@@ -15,6 +15,7 @@ import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedPacsResultVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -24,6 +25,8 @@ import java.util.List;
 public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -59,65 +62,62 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
                     medPacsResultList.add(medPacsResult);
                 });
                 execute(medPacsResultList);
-
-                return RespDTO.onSuc(list);
+                if(logSwitch){
+                    medPacsResultList.forEach(s->{
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("检查结果-正常","", JSON.toJSONString(list),"","");
+                    });
+                }
+                return RespDTO.onSuc("操作正常！");
             }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo("检查","",JSON.toJSONString(list),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检查","",JSON.toJSONString(list),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查结果-异常","",JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<MedPacsResult> medPacsResultList){
-        try {
-            List<MedPacsResult> addE = Lists.newLinkedList();
-            List<MedPacsResult> updateE = Lists.newLinkedList();
-            if (medPacsResultList != null && medPacsResultList.size() > 0) {
-                medPacsResultList.stream().forEach(s -> {
-                    MedPacsResult medPacsResult = this.getOne(new QueryWrapper<MedPacsResult>()
-                            .eq("rep_no", s.getRepNo())
-                            .eq("hospital_id", s.getHospitalId()), false);
-                    if (medPacsResult != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                this.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-            //aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"","操作成功!");
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("检查","",JSON.toJSONString(medPacsResultList),"",e.getMessage());
+        List<MedPacsResult> addE = Lists.newLinkedList();
+        List<MedPacsResult> updateE = Lists.newLinkedList();
+        if (medPacsResultList != null && medPacsResultList.size() > 0) {
+            medPacsResultList.stream().forEach(s -> {
+                MedPacsResult medPacsResult = this.getOne(new QueryWrapper<MedPacsResult>()
+                        .eq("rep_no", s.getRepNo())
+                        .eq("hospital_id", s.getHospitalId()), false);
+                if (medPacsResult != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+        }
+        if(addE.size()>0){
+            this.saveBatch(addE);
+        }
+        if(updateE.size()>0){
+            this.baseMapper.updateBatchByKey(updateE);
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isEmpty(aDeleteFlagVO.getReptNo())){
+            if(StringUtil.isEmpty(aDeleteFlagVO.getRepNo())){
                 return RespDTO.onError("请输入报告单号!");
             }else if(aDeleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
             }else {
                 UpdateWrapper<MedPacsResult> updateWrapper=new UpdateWrapper<>();
-                updateWrapper.eq("rep_no", aDeleteFlagVO.getReptNo())
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getRepNo())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
                         .eq("is_deleted",IsDeleteEnum.N)
                         .set("is_deleted",IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new MedPacsResult(),updateWrapper);
-                //aMedAbnormalInfoFacade.saveAbnormalInfo("检查-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){

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

@@ -17,6 +17,7 @@ import com.diagbot.vo.data.AMedicalRecordContentVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -30,6 +31,8 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
     private MedicalRecordContentServiceImpl medicalRecordContentService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
 
     private TZDBConn tzDBConn = new TZDBConn();
 

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

@@ -1,7 +1,6 @@
 package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
@@ -16,10 +15,11 @@ import com.diagbot.facade.*;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
 import com.diagbot.util.*;
-import com.diagbot.vo.*;
+import com.diagbot.vo.AnalyzeRunVO;
+import com.diagbot.vo.MedrecVo;
+import com.diagbot.vo.QueryVo;
 import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -68,6 +68,9 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     @Value("${encrypt.enable}")
     Boolean encryptFlag;
 
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrAdmissionNoteVO;
-import com.diagbot.vo.str.StrAdmissionNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
-
-    @Autowired
-    @Qualifier("strAdmissionNoteServiceImpl")
-    private StrAdmissionNoteServiceImpl strAdmissionNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -95,58 +84,4 @@ public class AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
         return flag;
     }
 
-    public RespDTO execDealData(List<StrAdmissionNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrAdmissionNoteVO strAdmissionNoteVO:list) {
-                if("".equals(strAdmissionNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strAdmissionNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strAdmissionNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrAdmissionNote> strAdmissionNoteList=Lists.newArrayList();
-            strAdmissionNoteList=BeanUtil.listCopyTo(list,StrAdmissionNote.class);
-            execute(strAdmissionNoteList);
-
-            return RespDTO.onSuc(strAdmissionNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrAdmissionNote> list){
-        try {
-            List<StrAdmissionNote> addE = Lists.newLinkedList();
-            List<StrAdmissionNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrAdmissionNote strAdmissionNote = this.getOne(new QueryWrapper<StrAdmissionNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strAdmissionNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strAdmissionNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-入院记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
-
 }

src/main/java/com/diagbot/facade/str/AStrBloodResultFacade.java

@@ -1,41 +1,25 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrBloodResultServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrBloodResultVO;
-import com.diagbot.vo.str.StrBloodResultVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @Description:输血后效果评价-业务类
- * @Author:liuqq
- * @time: ${DATE} ${TIME}
- **/
 @Component
 public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
-
-    @Autowired
-    @Qualifier("strBloodResultServiceImpl")
-    private StrBloodResultServiceImpl strBloodResultService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -84,11 +68,6 @@ public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
 
     }
 
-    /**
-     * @Description: 是否存在
-     * @Author:liuqq
-     * @time: ${DATE} ${TIME}
-     **/
     public Boolean isExist(StrBloodResult strBloodResult){
         Boolean flag=true;
         int count = this.baseMapper.selectCount(new QueryWrapper<StrBloodResult>()
@@ -100,63 +79,4 @@ public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
         }
         return flag;
     }
-
-    /**
-     * @Description:数据处理
-     * @Author:liuqq
-     * @time: ${DATE} ${TIME}
-     **/
-    public RespDTO execDealData(List<StrBloodResultVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrBloodResultVO strBloodResultVO:list) {
-                if("".equals(strBloodResultVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strBloodResultVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strBloodResultVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrBloodResult> strBloodResultList= Lists.newArrayList();
-            strBloodResultList= BeanUtil.listCopyTo(list,StrBloodResult.class);
-            execute(strBloodResultList);
-
-            return RespDTO.onSuc(strBloodResultList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrBloodResult> list){
-        try {
-            List<StrBloodResult> addE = Lists.newLinkedList();
-            List<StrBloodResult> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrBloodResult strBloodResult = this.getOne(new QueryWrapper<StrBloodResult>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strBloodResult != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strBloodResultService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-输血后效果评价","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,41 +1,25 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrBloodTransfusionServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrBloodTransfusionVO;
-import com.diagbot.vo.str.StrBloodTransfusionVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @Description:输血/血制品病程记录-业务类
- * @Author:liuqq
- * @time: ${DATE} ${TIME}
- **/
 @Component
 public class AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
-
-    @Autowired
-    @Qualifier("strBloodTransfusionServiceImpl")
-    private StrBloodTransfusionServiceImpl strBloodTransfusionService;
     @Autowired
     private ColumnFacade columnFacade;
 
@@ -101,58 +85,4 @@ public class AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrBloodTransfusionVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrBloodTransfusionVO strBloodTransfusionVO:list) {
-                if("".equals(strBloodTransfusionVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strBloodTransfusionVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strBloodTransfusionVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrBloodTransfusion> strBloodTransfusionList= Lists.newArrayList();
-            strBloodTransfusionList= BeanUtil.listCopyTo(list,StrBloodTransfusion.class);
-            execute(strBloodTransfusionList);
-
-            return RespDTO.onSuc(strBloodTransfusionList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrBloodTransfusion> list){
-        try {
-            List<StrBloodTransfusion> addE = Lists.newLinkedList();
-            List<StrBloodTransfusion> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrBloodTransfusion strBloodTransfusion = this.getOne(new QueryWrapper<StrBloodTransfusion>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strBloodTransfusion != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strBloodTransfusionService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-入院记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationApplyServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrConsultationApplyVO;
-import com.diagbot.vo.str.StrConsultationApplyVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrConsultationApplyFacade extends StrConsultationApplyServiceImpl {
-
-    @Autowired
-    @Qualifier("strConsultationApplyServiceImpl")
-    private StrConsultationApplyServiceImpl strConsultationApplyService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -97,58 +86,4 @@ public class AStrConsultationApplyFacade extends StrConsultationApplyServiceImpl
         return flag;
     }
 
-    public RespDTO execDealData(List<StrConsultationApplyVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrConsultationApplyVO strConsultationApplyVO:list) {
-                if("".equals(strConsultationApplyVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strConsultationApplyVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strConsultationApplyVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrConsultationApply> strConsultationApplyList= Lists.newArrayList();
-            strConsultationApplyList= BeanUtil.listCopyTo(list,StrConsultationApply.class);
-            execute(strConsultationApplyList);
-
-            return RespDTO.onSuc(strConsultationApplyList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrConsultationApply> list){
-        try {
-            List<StrConsultationApply> addE = Lists.newLinkedList();
-            List<StrConsultationApply> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrConsultationApply strConsultationApply = this.getOne(new QueryWrapper<StrConsultationApply>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strConsultationApply != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strConsultationApplyService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊申请单","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
-
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrConsultationNoteVO;
-import com.diagbot.vo.str.StrConsultationNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +21,6 @@ import java.util.Map;
 @Component
 public class AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
 
-    @Autowired
-    @Qualifier("strConsultationNoteServiceImpl")
-    private StrConsultationNoteServiceImpl strConsultationNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -98,58 +88,4 @@ public class AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
         return flag;
     }
 
-    public RespDTO execDealData(List<StrConsultationNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrConsultationNoteVO strConsultationNoteVO:list) {
-                if("".equals(strConsultationNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strConsultationNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strConsultationNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrConsultationNote> strConsultationNoteList= Lists.newArrayList();
-            strConsultationNoteList= BeanUtil.listCopyTo(list,StrConsultationNote.class);
-            execute(strConsultationNoteList);
-
-            return RespDTO.onSuc(strConsultationNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrConsultationNote> list){
-        try {
-            List<StrConsultationNote> addE = Lists.newLinkedList();
-            List<StrConsultationNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrConsultationNote strConsultationNote = this.getOne(new QueryWrapper<StrConsultationNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strConsultationNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strConsultationNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊申请单","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
-
 }

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

@@ -1,24 +1,19 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationRecordServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.AStrConsultationRecordVO;
-import com.diagbot.vo.str.StrConsultationRecordVO;
-import com.google.common.collect.Lists;
+import com.diagbot.vo.data.AStrConsultationNoteVO;
+import com.diagbot.vo.data.AStrConsultationResultVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,9 +22,7 @@ import java.util.Map;
 @Component
 public class AStrConsultationRecordFacade extends StrConsultationRecordServiceImpl {
 
-    @Autowired
-    @Qualifier("strConsultationRecordServiceImpl")
-    private StrConsultationRecordServiceImpl strConsultationRecordService;
+
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -44,7 +37,7 @@ public class AStrConsultationRecordFacade extends StrConsultationRecordServiceIm
         Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
         Boolean flag=columnFacade.createColumn(columnMap,"strConsultationRecord");
 
-        //Map<String, String> map=columnFacade.getColumn("strConsultationRecord");
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
         if(!flag){
             return;
         }
@@ -96,58 +89,4 @@ public class AStrConsultationRecordFacade extends StrConsultationRecordServiceIm
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrConsultationRecordVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrConsultationRecordVO strConsultationRecordVO:list) {
-                if("".equals(strConsultationRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strConsultationRecordVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strConsultationRecordVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrConsultationRecord> strConsultationRecordList= Lists.newArrayList();
-            strConsultationRecordList= BeanUtil.listCopyTo(list,StrConsultationRecord.class);
-            execute(strConsultationRecordList);
-
-            return RespDTO.onSuc(strConsultationRecordList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrConsultationRecord> list){
-        try {
-            List<StrConsultationRecord> addE = Lists.newLinkedList();
-            List<StrConsultationRecord> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrConsultationRecord strConsultationRecord = this.getOne(new QueryWrapper<StrConsultationRecord>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strConsultationRecord != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strConsultationRecordService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,41 +1,26 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationResultServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrConsultationResultVO;
-import com.diagbot.vo.str.StrConsultationResultVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @Description:会诊结果单-业务类
- * @Author:liuqq
- * @time: ${DATE} ${TIME}
- **/
 @Component
 public class AStrConsultationResultFacade extends StrConsultationResultServiceImpl {
 
-    @Autowired
-    @Qualifier("strConsultationResultServiceImpl")
-    private StrConsultationResultServiceImpl strConsultationResultService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -102,58 +87,4 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrConsultationResultVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrConsultationResultVO strConsultationResultVO:list) {
-                if("".equals(strConsultationResultVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strConsultationResultVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strConsultationResultVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrConsultationResult> strConsultationResultList= Lists.newArrayList();
-            strConsultationResultList= BeanUtil.listCopyTo(list,StrConsultationResult.class);
-            execute(strConsultationResultList);
-
-            return RespDTO.onSuc(strConsultationResultList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrConsultationResult> list){
-        try {
-            List<StrConsultationResult> addE = Lists.newLinkedList();
-            List<StrConsultationResult> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrConsultationResult strConsultationResult = this.getOne(new QueryWrapper<StrConsultationResult>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strConsultationResult != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strConsultationResultService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊结果单","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrCrisisNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrCrisisNoteVO;
-import com.diagbot.vo.str.StrCrisisNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
-
-    @Autowired
-    @Qualifier("strCrisisNoteServiceImpl")
-    private StrCrisisNoteServiceImpl strCrisisNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -93,58 +82,4 @@ public class AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrCrisisNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrCrisisNoteVO strCrisisNoteVO:list) {
-                if("".equals(strCrisisNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strCrisisNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strCrisisNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrCrisisNote> strCrisisNoteList= Lists.newArrayList();
-            strCrisisNoteList= BeanUtil.listCopyTo(list,StrCrisisNote.class);
-            execute(strCrisisNoteList);
-
-            return RespDTO.onSuc(strCrisisNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrCrisisNote> list){
-        try {
-            List<StrCrisisNote> addE = Lists.newLinkedList();
-            List<StrCrisisNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrCrisisNote strCrisisNote = this.getOne(new QueryWrapper<StrCrisisNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strCrisisNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strCrisisNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-危急值记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrDeathDiscussionServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrDeathDiscussionVO;
-import com.diagbot.vo.str.StrDeathDiscussionVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,9 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
-    @Autowired
-    @Qualifier("strDeathDiscussionServiceImpl")
-    private StrDeathDiscussionServiceImpl strDeathDiscussionService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -95,58 +85,4 @@ public class AStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrDeathDiscussionVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrDeathDiscussionVO strDeathDiscussionVO:list) {
-                if("".equals(strDeathDiscussionVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strDeathDiscussionVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strDeathDiscussionVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrDeathDiscussion> strDeathDiscussionList= Lists.newArrayList();
-            strDeathDiscussionList= BeanUtil.listCopyTo(list,StrDeathDiscussion.class);
-            execute(strDeathDiscussionList);
-
-            return RespDTO.onSuc(strDeathDiscussionList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrDeathDiscussion> list){
-        try {
-            List<StrDeathDiscussion> addE = Lists.newLinkedList();
-            List<StrDeathDiscussion> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrDeathDiscussion strDeathDiscussion = this.getOne(new QueryWrapper<StrDeathDiscussion>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strDeathDiscussion != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strDeathDiscussionService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-死亡病例讨论记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrDeathNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrDeathNoteVO;
-import com.diagbot.vo.str.StrDeathNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrDeathNoteFacade extends StrDeathNoteServiceImpl {
-
-    @Autowired
-    @Qualifier("strDeathNoteServiceImpl")
-    private StrDeathNoteServiceImpl strDeathNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -96,58 +85,4 @@ public class AStrDeathNoteFacade extends StrDeathNoteServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrDeathNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrDeathNoteVO strDeathNoteVO:list) {
-                if("".equals(strDeathNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strDeathNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strDeathNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrDeathNote> strDeathNoteList= Lists.newArrayList();
-            strDeathNoteList= BeanUtil.listCopyTo(list,StrDeathNote.class);
-            execute(strDeathNoteList);
-
-            return RespDTO.onSuc(strDeathNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrDeathNote> list){
-        try {
-            List<StrDeathNote> addE = Lists.newLinkedList();
-            List<StrDeathNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrDeathNote strDeathNote = this.getOne(new QueryWrapper<StrDeathNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strDeathNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strDeathNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-死亡记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrDifficultCase;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrDifficultCaseServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrDifficultCaseVO;
-import com.diagbot.vo.str.StrDifficultCaseVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
-
-    @Autowired
-    @Qualifier("strDifficultCaseServiceImpl")
-    private StrDifficultCaseServiceImpl strDifficultCaseService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -93,58 +82,4 @@ public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrDifficultCaseVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrDifficultCaseVO strDifficultCaseVO:list) {
-                if("".equals(strDifficultCaseVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strDifficultCaseVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strDifficultCaseVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrDifficultCase> strDifficultCaseList= Lists.newArrayList();
-            strDifficultCaseList= BeanUtil.listCopyTo(list,StrDifficultCase.class);
-            execute(strDifficultCaseList);
-
-            return RespDTO.onSuc(strDifficultCaseList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrDifficultCase> list){
-        try {
-            List<StrDifficultCase> addE = Lists.newLinkedList();
-            List<StrDifficultCase> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrDifficultCase strDifficultCase = this.getOne(new QueryWrapper<StrDifficultCase>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strDifficultCase != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strDifficultCaseService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-死亡记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrFirstRecord;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrFirstRecordServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrFirstRecordVO;
-import com.diagbot.vo.str.StrFirstRecordVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +21,6 @@ import java.util.Map;
 @Component
 public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
 
-    @Autowired
-    @Qualifier("strFirstRecordServiceImpl")
-    private StrFirstRecordServiceImpl strFirstRecordService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -93,58 +83,4 @@ public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrFirstRecordVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrFirstRecordVO strFirstRecordVO:list) {
-                if("".equals(strFirstRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strFirstRecordVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strFirstRecordVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrFirstRecord> strFirstRecordList= Lists.newArrayList();
-            strFirstRecordList= BeanUtil.listCopyTo(list,StrFirstRecord.class);
-            execute(strFirstRecordList);
-
-            return RespDTO.onSuc(strFirstRecordList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrFirstRecord> list){
-        try {
-            List<StrFirstRecord> addE = Lists.newLinkedList();
-            List<StrFirstRecord> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrFirstRecord strFirstRecord = this.getOne(new QueryWrapper<StrFirstRecord>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strFirstRecord != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strFirstRecordService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-首次病程录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrIllCriticallyServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrIllCriticallyVO;
-import com.diagbot.vo.str.StrIllCriticallyVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +21,6 @@ import java.util.Map;
 @Component
 public class AStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
 
-    @Autowired
-    @Qualifier("strIllCriticallyServiceImpl")
-    private StrIllCriticallyServiceImpl strIllCriticallyService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -92,58 +82,4 @@ public class AStrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrIllCriticallyVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrIllCriticallyVO strIllCriticallyVO:list) {
-                if("".equals(strIllCriticallyVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strIllCriticallyVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strIllCriticallyVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrIllCritically> strIllCriticallyList= Lists.newArrayList();
-            strIllCriticallyList= BeanUtil.listCopyTo(list,StrIllCritically.class);
-            execute(strIllCriticallyList);
-
-            return RespDTO.onSuc(strIllCriticallyList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrIllCritically> list){
-        try {
-            List<StrIllCritically> addE = Lists.newLinkedList();
-            List<StrIllCritically> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrIllCritically strIllCritically = this.getOne(new QueryWrapper<StrIllCritically>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strIllCritically != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strIllCriticallyService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病危通知单","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrIllSeriouslFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrIllSeriouslServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrIllSeriouslVO;
-import com.diagbot.vo.str.StrIllSeriouslVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +21,6 @@ import java.util.Map;
 @Component
 public class AStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
 
-    @Autowired
-    @Qualifier("strIllSeriouslServiceImpl")
-    private StrIllSeriouslServiceImpl strIllSeriouslService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -92,58 +82,4 @@ public class AStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrIllSeriouslVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrIllSeriouslVO strIllSeriouslVO:list) {
-                if("".equals(strIllSeriouslVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strIllSeriouslVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strIllSeriouslVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrIllSeriousl> strIllSeriouslList= Lists.newArrayList();
-            strIllSeriouslList= BeanUtil.listCopyTo(list,StrIllSeriousl.class);
-            execute(strIllSeriouslList);
-
-            return RespDTO.onSuc(strIllSeriouslList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrIllSeriousl> list){
-        try {
-            List<StrIllSeriousl> addE = Lists.newLinkedList();
-            List<StrIllSeriousl> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrIllSeriousl strIllSeriousl = this.getOne(new QueryWrapper<StrIllSeriousl>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strIllSeriousl != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strIllSeriouslService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病重通知单","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrLeaveHospitalFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrLeaveHospitalServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrLeaveHospitalVO;
-import com.diagbot.vo.str.StrLeaveHospitalVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
-
-    @Autowired
-    @Qualifier("strLeaveHospitalServiceImpl")
-    private StrLeaveHospitalServiceImpl strLeaveHospitalService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -96,58 +85,4 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrLeaveHospitalVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrLeaveHospitalVO strLeaveHospitalVO:list) {
-                if("".equals(strLeaveHospitalVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strLeaveHospitalVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strLeaveHospitalVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrLeaveHospital> strLeaveHospitalList= Lists.newArrayList();
-            strLeaveHospitalList= BeanUtil.listCopyTo(list,StrLeaveHospital.class);
-            execute(strLeaveHospitalList);
-
-            return RespDTO.onSuc(strLeaveHospitalList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrLeaveHospital> list){
-        try {
-            List<StrLeaveHospital> addE = Lists.newLinkedList();
-            List<StrLeaveHospital> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrLeaveHospital strLeaveHospital = this.getOne(new QueryWrapper<StrLeaveHospital>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strLeaveHospital != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strLeaveHospitalService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-出院小结","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrOperativeFirstRecord.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrOperativeFirstRecordServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrOperativeFirstRecordVO;
-import com.diagbot.vo.str.StrOperativeFirstRecordVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +21,6 @@ import java.util.Map;
 @Component
 public class AStrOperativeFirstRecord extends StrOperativeFirstRecordServiceImpl {
 
-    @Autowired
-    @Qualifier("strOperativeFirstRecordServiceImpl")
-    private StrOperativeFirstRecordServiceImpl strOperativeFirstRecordService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -97,58 +87,4 @@ public class AStrOperativeFirstRecord extends StrOperativeFirstRecordServiceImpl
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrOperativeFirstRecordVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrOperativeFirstRecordVO strOperativeFirstRecordVO:list) {
-                if("".equals(strOperativeFirstRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strOperativeFirstRecordVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strOperativeFirstRecordVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrOperativeFirstRecord> strOperativeFirstRecordList= Lists.newArrayList();
-            strOperativeFirstRecordList= BeanUtil.listCopyTo(list,StrOperativeFirstRecord.class);
-            execute(strOperativeFirstRecordList);
-
-            return RespDTO.onSuc(strOperativeFirstRecordList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrOperativeFirstRecord> list){
-        try {
-            List<StrOperativeFirstRecord> addE = Lists.newLinkedList();
-            List<StrOperativeFirstRecord> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrOperativeFirstRecord strOperativeFirstRecord = this.getOne(new QueryWrapper<StrOperativeFirstRecord>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strOperativeFirstRecord != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strOperativeFirstRecordService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-术后首程","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrOperativeNoteFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrOperativeNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrOperativeNoteVO;
-import com.diagbot.vo.str.StrOperativeNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
-
-    @Autowired
-    @Qualifier("strOperativeNoteServiceImpl")
-    private StrOperativeNoteServiceImpl strOperativeNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -97,58 +86,4 @@ public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrOperativeNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrOperativeNoteVO strOperativeNoteVO:list) {
-                if("".equals(strOperativeNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strOperativeNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strOperativeNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrOperativeNote> strOperativeNoteList= Lists.newArrayList();
-            strOperativeNoteList= BeanUtil.listCopyTo(list,StrOperativeNote.class);
-            execute(strOperativeNoteList);
-
-            return RespDTO.onSuc(strOperativeNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrOperativeNote> list){
-        try {
-            List<StrOperativeNote> addE = Lists.newLinkedList();
-            List<StrOperativeNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrOperativeNote strOperativeNote = this.getOne(new QueryWrapper<StrOperativeNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strOperativeNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strOperativeNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-手术记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrPeriodConclusionFacade.java

@@ -1,24 +1,18 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrPeriodConclusionServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrAdmissionNoteVO;
 import com.diagbot.vo.data.AStrPeriodConclusionVO;
-import com.diagbot.vo.str.StrPeriodConclusionVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +22,6 @@ import java.util.Map;
 @Component
 public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
 
-    @Autowired
-    @Qualifier("strPeriodConclusionServiceImpl")
-    private StrPeriodConclusionServiceImpl strPeriodConclusionService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -94,58 +85,4 @@ public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
         return flag;
     }
 
-    public RespDTO execDealData(List<StrPeriodConclusionVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrPeriodConclusionVO strPeriodConclusionVO:list) {
-                if("".equals(strPeriodConclusionVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strPeriodConclusionVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strPeriodConclusionVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrPeriodConclusion> strPeriodConclusionList= Lists.newArrayList();
-            strPeriodConclusionList= BeanUtil.listCopyTo(list,StrPeriodConclusion.class);
-            execute(strPeriodConclusionList);
-
-            return RespDTO.onSuc(strPeriodConclusionList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrPeriodConclusion> list){
-        try {
-            List<StrPeriodConclusion> addE = Lists.newLinkedList();
-            List<StrPeriodConclusion> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrPeriodConclusion strPeriodConclusion = this.getOne(new QueryWrapper<StrPeriodConclusion>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strPeriodConclusion != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strPeriodConclusionService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-阶段小结","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
-
 }

src/main/java/com/diagbot/facade/str/AStrPreoperativeDiscussionFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrPreoperativeDiscussionServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrPreoperativeDiscussionVO;
-import com.diagbot.vo.str.StrPreoperativeDiscussionVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionServiceImpl {
-
-    @Autowired
-    @Qualifier("strPreoperativeDiscussionServiceImpl")
-    private StrPreoperativeDiscussionServiceImpl strPreoperativeDiscussionService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -95,58 +84,4 @@ public class AStrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionS
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrPreoperativeDiscussionVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrPreoperativeDiscussionVO strPreoperativeDiscussionVO:list) {
-                if("".equals(strPreoperativeDiscussionVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strPreoperativeDiscussionVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strPreoperativeDiscussionVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrPreoperativeDiscussion> strPreoperativeDiscussionList= Lists.newArrayList();
-            strPreoperativeDiscussionList= BeanUtil.listCopyTo(list,StrPreoperativeDiscussion.class);
-            execute(strPreoperativeDiscussionList);
-
-            return RespDTO.onSuc(strPreoperativeDiscussionList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrPreoperativeDiscussion> list){
-        try {
-            List<StrPreoperativeDiscussion> addE = Lists.newLinkedList();
-            List<StrPreoperativeDiscussion> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrPreoperativeDiscussion strPreoperativeDiscussion = this.getOne(new QueryWrapper<StrPreoperativeDiscussion>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strPreoperativeDiscussion != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strPreoperativeDiscussionService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-术前讨论小结","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrRescueNoteFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrRescueNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrRescueNoteVO;
-import com.diagbot.vo.str.StrRescueNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrRescueNoteFacade extends StrRescueNoteServiceImpl {
-
-    @Autowired
-    @Qualifier("strRescueNoteServiceImpl")
-    private StrRescueNoteServiceImpl strRescueNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -95,58 +84,4 @@ public class AStrRescueNoteFacade extends StrRescueNoteServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrRescueNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrRescueNoteVO strRescueNoteVO:list) {
-                if("".equals(strRescueNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strRescueNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strRescueNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrRescueNote> strRescueNoteList= Lists.newArrayList();
-            strRescueNoteList= BeanUtil.listCopyTo(list,StrRescueNote.class);
-            execute(strRescueNoteList);
-
-            return RespDTO.onSuc(strRescueNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrRescueNote> list){
-        try {
-            List<StrRescueNote> addE = Lists.newLinkedList();
-            List<StrRescueNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrRescueNote strRescueNote = this.getOne(new QueryWrapper<StrRescueNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strRescueNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strRescueNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-抢救记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrTransferInNoteFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrTransferInNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrTransferInNoteVO;
-import com.diagbot.vo.str.StrTransferInNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +21,6 @@ import java.util.Map;
 @Component
 public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
 
-    @Autowired
-    @Qualifier("strTransferInNoteServiceImpl")
-    private StrTransferInNoteServiceImpl strTransferInNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -94,58 +84,4 @@ public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
         return flag;
     }
 
-    public RespDTO execDealData(List<StrTransferInNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrTransferInNoteVO strTransferInNoteVO:list) {
-                if("".equals(strTransferInNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strTransferInNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strTransferInNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrTransferInNote> strTransferInNoteList= Lists.newArrayList();
-            strTransferInNoteList= BeanUtil.listCopyTo(list,StrTransferInNote.class);
-            execute(strTransferInNoteList);
-
-            return RespDTO.onSuc(strTransferInNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrTransferInNote> list){
-        try {
-            List<StrTransferInNote> addE = Lists.newLinkedList();
-            List<StrTransferInNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrTransferInNote strTransferInNote = this.getOne(new QueryWrapper<StrTransferInNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strTransferInNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strTransferInNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-转入记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
-
 }

src/main/java/com/diagbot/facade/str/AStrTransferOutNoteFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrTransferOutNoteServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrTransferOutNoteVO;
-import com.diagbot.vo.str.StrTransferOutNoteVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -28,9 +21,6 @@ import java.util.Map;
 @Component
 public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
 
-    @Autowired
-    @Qualifier("strTransferOutNoteServiceImpl")
-    private StrTransferOutNoteServiceImpl strTransferOutNoteService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -92,58 +82,4 @@ public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrTransferOutNoteVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrTransferOutNoteVO strTransferOutNoteVO:list) {
-                if("".equals(strTransferOutNoteVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strTransferOutNoteVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strTransferOutNoteVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrTransferOutNote> strTransferOutNoteList= Lists.newArrayList();
-            strTransferOutNoteList= BeanUtil.listCopyTo(list,StrTransferOutNote.class);
-            execute(strTransferOutNoteList);
-
-            return RespDTO.onSuc(strTransferOutNoteList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrTransferOutNote> list){
-        try {
-            List<StrTransferOutNote> addE = Lists.newLinkedList();
-            List<StrTransferOutNote> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrTransferOutNote strTransferOutNote = this.getOne(new QueryWrapper<StrTransferOutNote>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strTransferOutNote != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strTransferOutNoteService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-转出记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

src/main/java/com/diagbot/facade/str/AStrWardRecordFacade.java

@@ -1,24 +1,17 @@
-package com.diagbot.facade.str;
+package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrWardRecord;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrWardRecordServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.vo.data.AStrWardRecordVO;
-import com.diagbot.vo.str.StrWardRecordVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,10 +20,6 @@ import java.util.Map;
 
 @Component
 public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
-
-    @Autowired
-    @Qualifier("strWardRecordServiceImpl")
-    private StrWardRecordServiceImpl strWardRecordService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -95,58 +84,4 @@ public class AStrWardRecordFacade extends StrWardRecordServiceImpl {
         }
         return flag;
     }
-
-    public RespDTO execDealData(List<StrWardRecordVO> list){
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (StrWardRecordVO strWardRecordVO:list) {
-                if("".equals(strWardRecordVO.getRecId())) {
-                    return RespDTO.onError("请输入记录编号!");
-                }else if(strWardRecordVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strWardRecordVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-            }
-            //初始、格式化数据
-            List<StrWardRecord> strWardRecordList= Lists.newArrayList();
-            strWardRecordList= BeanUtil.listCopyTo(list,StrWardRecord.class);
-            execute(strWardRecordList);
-
-            return RespDTO.onSuc(strWardRecordList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
-        }
-    }
-
-    public void execute(List<StrWardRecord> list){
-        try {
-            List<StrWardRecord> addE = Lists.newLinkedList();
-            List<StrWardRecord> updateE = Lists.newLinkedList();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(s -> {
-                    StrWardRecord strWardRecord = this.getOne(new QueryWrapper<StrWardRecord>()
-                            .eq("rec_id", s.getRecId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("behospital_code",s.getBehospitalCode()), false);
-                    if (strWardRecord != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
-                    }
-                });
-            }
-            if(addE.size()>0){
-                strWardRecordService.saveBatch(addE);
-            }
-            if(updateE.size()>0){
-                this.baseMapper.updateBatchByKey(updateE);
-            }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-查房记录","", JSON.toJSONString(list),"",e.getMessage());
-        }
-    }
 }

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

@@ -2,12 +2,14 @@ package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
 import com.diagbot.dto.OutputInfo;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.Response;
 import com.diagbot.enums.CacheKeyEnum;
+import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.QcClientFacade;
-import com.diagbot.facade.str.*;
 import com.diagbot.service.impl.ColumnServiceImpl;
 import com.diagbot.vo.QueryVo;
+import com.diagbot.vo.str.StrContentVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -54,6 +56,33 @@ public class ColumnFacade extends ColumnServiceImpl {
 
     }
 
+    /**
+     * @Description:解析his传输过来的wholeData
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public void analyseWholeData(StrContentVO strContentVO){
+        //调用解析接口
+        Response<OutputInfo> resp=null;
+        //qcClientFacade.analyseField(queryVo);
+        if(resp.getData()!=null && resp.getData().getPageData()!=null){
+            Map<String, Object> pageData=resp.getData().getPageData();
+            pageData.forEach((key,value)->{
+                List<Map<String, Object>> listMap=(List<Map<String,Object>>)resp.getData().getPageData().get(key);
+                Map<String, String> columnMap=this.getColumn(CacheKeyEnum.getName(key));
+
+                Map<String, Object> entityMap=new HashMap<String, Object>();
+                listMap.forEach(s->{
+                    columnMap.forEach((k, v) -> {
+                        entityMap.put(v,s.get(k));
+                    });
+                    //数据解析
+                    analysisData(ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId())),entityMap,strContentVO.getHospitalId(),JSON.toJSONString(s));
+                });
+            });
+        }
+    }
+
     /**
      * 数据解析
      * @param modelName
@@ -61,59 +90,54 @@ public class ColumnFacade extends ColumnServiceImpl {
      * @param hospitalId
      */
     private void analysisData(String modelName,Map<String, Object> entityMap,Long hospitalId,String columnMap){
-        try {
-            if("入院记录".equals(modelName)){
-                aStrAdmissionNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("首次病程录".equals(modelName)){
-                aStrFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("输血后效果评价".equals(modelName)){
-                aStrBloodResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("输血/血制品病程记录".equals(modelName)){
-                aStrBloodTransfusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("转入记录".equals(modelName)){
-                aStrTransferInNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("转出记录".equals(modelName)){
-                aStrTransferOutNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("病危通知书".equals(modelName)){
-                aStrIllCriticallyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("病重通知书".equals(modelName)){
-                aStrIllSeriouslFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("疑难病例讨论记录".equals(modelName)){
-                aStrDifficultCaseFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("死亡记录".equals(modelName)){
-                aStrDeathNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("死亡病例讨论记录".equals(modelName)){
-                aStrDeathDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("查房记录".equals(modelName)){
-                aStrWardRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("术后首次病程及谈话记录".equals(modelName)){
-                aStrOperativeFirstRecord.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("术前讨论、术前小结".equals(modelName)){
-                aStrPreoperativeDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("手术记录".equals(modelName)){
-                aStrOperativeNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("抢救记录".equals(modelName)){
-                aStrRescueNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("危急值记录".equals(modelName)){
-                aStrCrisisNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("出院小结".equals(modelName)){
-                aStrLeaveHospitalFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("会诊申请单".equals(modelName)){
-                aStrConsultationApplyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("会诊结果单".equals(modelName)){
-                aStrConsultationResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if("会诊单".equals(modelName)){
-                aStrConsultationNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }else if ("会诊记录".equals(modelName)){
-                aStrConsultationRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            } else if("阶段小结".equals(modelName)){
-                aStrPeriodConclusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
-            }
-            log.info(modelName+"---- 解析完成！");
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析异常", "",JSON.toJSONString(columnMap),"",e.getMessage());
+        if("入院记录".equals(modelName)){
+            aStrAdmissionNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("首次病程录".equals(modelName)){
+            aStrFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("输血后效果评价".equals(modelName)){
+            aStrBloodResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("输血/血制品病程记录".equals(modelName)){
+            aStrBloodTransfusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("转入记录".equals(modelName)){
+            aStrTransferInNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("转出记录".equals(modelName)){
+            aStrTransferOutNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("病危通知书".equals(modelName)){
+            aStrIllCriticallyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("病重通知书".equals(modelName)){
+            aStrIllSeriouslFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("疑难病例讨论记录".equals(modelName)){
+            aStrDifficultCaseFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("死亡记录".equals(modelName)){
+            aStrDeathNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("死亡病例讨论记录".equals(modelName)){
+            aStrDeathDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("查房记录".equals(modelName)){
+            aStrWardRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("术后首次病程及谈话记录".equals(modelName)){
+            aStrOperativeFirstRecord.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("术前讨论、术前小结".equals(modelName)){
+            aStrPreoperativeDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("手术记录".equals(modelName)){
+            aStrOperativeNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("抢救记录".equals(modelName)){
+            aStrRescueNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("危急值记录".equals(modelName)){
+            aStrCrisisNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("出院小结".equals(modelName)){
+            aStrLeaveHospitalFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("会诊申请单".equals(modelName)){
+            aStrConsultationApplyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("会诊结果单".equals(modelName)){
+            aStrConsultationResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if("会诊单".equals(modelName)){
+            aStrConsultationNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        }else if ("会诊记录".equals(modelName)){
+            aStrConsultationRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+        } else if("阶段小结".equals(modelName)){
+            aStrPeriodConclusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
         }
+        log.info(modelName+"---- 解析完成！");
     }
 
     @Autowired

src/main/java/com/diagbot/facade/str/BStrBloodTransfusionFacade.java

@@ -130,7 +130,7 @@ public class BStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
 
                 if(logSwitch){
                     strBloodTransfusionList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-输血后效果评价-正常", s.getRecId(), JSON.toJSONString(s), "", "");
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-输血/血制品病程记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
                     });
                 }
                 return RespDTO.onSuc("操作正常！");
@@ -141,7 +141,7 @@ public class BStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
             log.error(e.getMessage(),e);
             if(list!=null && list.size()>0) {
                 list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-输血后效果评价-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-输血/血制品病程记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
                 });
             }
             return RespDTO.onError("数据处理异常，详情查看日志表");

src/main/java/com/diagbot/facade/str/BStrContentFacade.java

@@ -0,0 +1,54 @@
+package com.diagbot.facade.str;
+
+/**
+ * @Description:文书核心业务处理类
+ * @Author:liuqq
+ * @time: ${DATE} ${TIME}
+ **/
+
+import com.alibaba.fastjson.JSON;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.enums.ModeIdEnum;
+import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.ColumnFacade;
+import com.diagbot.vo.str.StrContentVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BStrContentFacade {
+
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    @Autowired
+    private ColumnFacade columnFacade;
+
+    @Value("${log_switch.enable}")
+    private boolean logSwitch;
+
+    public RespDTO execDealData(StrContentVO strContentVO){
+        try{
+            if("".equals(strContentVO.getModelId())){
+                return RespDTO.onError("请输入模板类型ID!");
+            }else if("".equals(strContentVO.getRecId())) {
+                return RespDTO.onError("请输入记录编号!");
+            }else if(strContentVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if("".equals(strContentVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else{
+                columnFacade.analyseWholeData(strContentVO);
+
+                if(logSwitch){
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-文书-正常", strContentVO.getRecId(), JSON.toJSONString(strContentVO), "", ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId())));
+                }
+                return RespDTO.onSuc("操作正常！");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-文书-异常", ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId())), JSON.toJSONString(strContentVO), "", e.getMessage());
+            return RespDTO.onError("数据处理异常，详情查看日志表");
+        }
+    }
+}

src/main/java/com/diagbot/facade/str/BStrIllSeriouslFacade.java

@@ -99,7 +99,7 @@ public class BStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
     }
 
     /**
-     * @Description:病危通知单-结构化-独立入口
+     * @Description:病重通知单-结构化-独立入口
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
@@ -122,7 +122,7 @@ public class BStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
 
                 if(logSwitch){
                     strIllSeriouslList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病危通知单-正常", s.getRecId(), JSON.toJSONString(s), "", "");
+                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病重通知单-正常", s.getRecId(), JSON.toJSONString(s), "", "");
                     });
                 }
                 return RespDTO.onSuc("操作正常！");
@@ -133,7 +133,7 @@ public class BStrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
             log.error(e.getMessage(),e);
             if(list!=null && list.size()>0) {
                 list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病危通知单-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病重通知单-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
                 });
             }
             return RespDTO.onError("数据处理异常，详情查看日志表");

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

@@ -33,4 +33,6 @@ public interface MedLisInfoMapper extends BaseMapper<MedLisInfo> {
     List<String> getInfo(@Param("hospitalId") Long hospitalId, @Param("behospitalCode") String behospitalCode);
 
     IPage<ExamineSonInfoDTO> getExamineSonInfo(@Param("examineSonInfoVO") ExamineSonInfoVO examineSonInfoVO, @Param("infos") Set<String> infos);
+
+    void updateBatchByKey(List<MedLisInfo> list);
 }

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

@@ -2,12 +2,9 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.CheckInfoDTO;
-import com.diagbot.dto.DoctorAdviceDTO;
-import com.diagbot.entity.DoctorAdvice;
 import com.diagbot.entity.MedPacsInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.CheckInfoVO;
-import com.diagbot.vo.DoctorAdviceVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -31,4 +28,5 @@ public interface MedPacsInfoMapper extends BaseMapper<MedPacsInfo> {
 
     List<String> getInfo(@Param("hospitalId") Long hospitalId, @Param("behospitalCode") String behospitalCode);
 
+    void updateBatchByKey(List<MedPacsInfo> list);
 }

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

@@ -1,23 +1,17 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.CheckInfoDTO;
-import com.diagbot.dto.DoctorAdviceDTO;
 import com.diagbot.dto.ExamineInfoDTO;
 import com.diagbot.dto.ExamineSonInfoDTO;
 import com.diagbot.entity.MedLisInfo;
 import com.diagbot.mapper.MedLisInfoMapper;
 import com.diagbot.service.MedLisInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.CheckInfoVO;
-import com.diagbot.vo.DoctorAdviceVO;
 import com.diagbot.vo.ExamineInfoVO;
 import com.diagbot.vo.ExamineSonInfoVO;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

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

@@ -10,7 +10,6 @@ import com.diagbot.vo.CheckInfoVO;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotBlank;
 import java.util.*;
 
 /**

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

@@ -1,6 +1,6 @@
 package com.diagbot.util;
 
-import com.diagbot.facade.str.*;
+import com.diagbot.facade.data.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;

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

@@ -1,10 +1,8 @@
 package com.diagbot.vo.data;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
-@Getter
-@Setter
+@Data
 public class ADeleteFlagVO {
 
     private String modeType;
@@ -27,6 +25,6 @@ public class ADeleteFlagVO {
 
     private String recId;
 
-    private String reptNo;
+    private String repNo;
 
-}
+}

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

@@ -0,0 +1,71 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedLisInfoVO {
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告类型代码
+     */
+    private String repType;
+
+    /**
+     * 报告名称
+     */
+    private String repName;
+
+    /**
+     * 检查类型名称
+     */
+    private String repTypeName;
+
+    /**
+     * 标本名称
+     */
+    private String slideType;
+
+    /**
+     * 发布时间
+     */
+    private String repDate;
+
+    /**
+     * 报告检查时间
+     */
+    private String checkDate;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 开单科室代码
+     */
+    private String deptId;
+
+    /**
+     * 开单科室名称
+     */
+    private String deptName;
+
+    /**
+     * 报告单状态
+     */
+    private String registerFlag;
+}

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

@@ -0,0 +1,86 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedPacsInfoVO {
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告名称
+     */
+    private String repName;
+
+    /**
+     * 报告类型代码
+     */
+    private String repType;
+
+    /**
+     * 检查类型名称
+     */
+    private String repTypeName;
+
+    /**
+     * 检查部位
+     */
+    private String part;
+
+    /**
+     * 发布时间
+     */
+    private String repDate;
+
+    /**
+     * 报告检查时间
+     */
+    private String checkDate;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 开单科室代码
+     */
+    private String deptId;
+
+    /**
+     * 开单科室名称
+     */
+    private String deptName;
+
+    /**
+     * 报告单状态
+     */
+    private String registerFlag;
+
+    /**
+     * 报告医生
+     */
+    private String reportDoctor;
+
+    /**
+     * 报告审核医生
+     */
+    private String checker;
+
+    /**
+     * 云胶片地址
+     */
+    private String yjpdz;
+}

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

@@ -16,7 +16,6 @@ public class BasDoctorInfoVO {
      * 搜索参数
      */
     private String inputStr;
-    private String isPlacefile;
     private String deptName;
     @ApiModelProperty(hidden = true)
     private String deptId;

src/main/java/com/diagbot/vo/str/StrContentVO.java

@@ -0,0 +1,36 @@
+package com.diagbot.vo.str;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author:liuqq
+ * @time: ${DATE} ${TIME}
+ **/
+@Data
+public class StrContentVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 模板类型ID
+     */
+    private String modelId;
+
+}

src/main/java/com/diagbot/vo/str/StrInformedConsentVO.java

@@ -3,7 +3,8 @@ package com.diagbot.vo.str;
 import lombok.Data;
 
 @Data
-public class StrInformedConsentVO {
+public class StrInformedConsentVO  {
+
     /**
      * 病历ID
      */
@@ -33,4 +34,4 @@ public class StrInformedConsentVO {
      * 文书类别
      */
     private String recType;
-}
+}

src/main/java/com/diagbot/vo/str/StrTalkInformVO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class StrTalkInformVO {
+
     /**
      * 病历ID
      */
@@ -33,4 +34,4 @@ public class StrTalkInformVO {
      * 文书类别
      */
     private String recType;
-}
+}

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

@@ -1,255 +0,0 @@
-/*
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.str.*;
-import com.diagbot.vo.str.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/qc/data_str")
-@Api(value = "对接接口API-结构化", tags = { "对接接口API-结构化" })
-public class ADataStrController {
-
-    @Autowired
-    private AStrAdmissionNoteFacade aStrAdmissionNoteFacade;
-
-    @Autowired
-    private AStrBloodResultFacade aStrBloodResultFacade;
-
-    @Autowired
-    private AStrBloodTransfusionFacade aStrBloodTransfusionFacade;
-
-    @Autowired
-    private AStrConsultationApplyFacade aStrConsultationApplyFacade;
-
-    @Autowired
-    private AStrCrisisNoteFacade aStrCrisisNoteFacade;
-
-    @Autowired
-    private AStrConsultationRecordFacade aStrConsultationRecordFacade;
-
-    @Autowired
-    private AStrConsultationResultFacade aStrConsultationResultFacade;
-
-    @Autowired
-    private AStrConsultationNoteFacade aStrConsultationNoteFacade;
-
-    @Autowired
-    private AStrFirstRecordFacade aStrFirstRecordFacade;
-
-    @Autowired
-    private AStrDifficultCaseFacade aStrDifficultCaseFacade;
-
-    @Autowired
-    private AStrDeathDiscussionFacade aStrDeathDiscussionFacade;
-
-    @Autowired
-    private AStrDeathNoteFacade aStrDeathNoteFacade;
-
-    @Autowired
-    private AStrOperativeFirstRecord aStrOperativeFirstRecordFacade;
-
-    @Autowired
-    private AStrLeaveHospitalFacade aStrLeaveHospitalFacade;
-
-    @Autowired
-    private AStrIllCriticallyFacade aStrIllCriticallyFacade;
-
-    @Autowired
-    private AStrIllSeriouslFacade aStrIllSeriouslFacade;
-
-
-    @Autowired
-    private AStrPreoperativeDiscussionFacade aStrPreoperativeDiscussionFacade;
-
-    @Autowired
-    private AStrPeriodConclusionFacade aStrPeriodConclusionFacade;
-
-    @Autowired
-    private AStrRescueNoteFacade aStrRescueNoteFacade;
-
-    @Autowired
-    private AStrTransferInNoteFacade aStrTransferInNoteFacade;
-
-    @Autowired
-    private AStrTransferOutNoteFacade aStrTransferOutNoteFacade;
-
-    @Autowired
-    private AStrWardRecordFacade aStrWardRecordFacade;
-
-    @Autowired
-    private AStrOperativeNoteFacade aStrOperativeNoteFacade;
-
-    @ApiOperation(value = "入院记录")
-    @PostMapping("/sendAdmissionNote")
-    @SysLogger("sendAdmissionNote")
-    public RespDTO sendAdmissionNote(@RequestBody List<StrAdmissionNoteVO> list){
-        return aStrAdmissionNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "输血后效果评价")
-    @PostMapping("/sendBloodResult")
-    @SysLogger("sendBloodResult")
-    public RespDTO sendBloodResult(@RequestBody List<StrBloodResultVO> list){
-        return aStrBloodResultFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "输血/血制品病程记录")
-    @PostMapping("/sendBloodTransfusion")
-    @SysLogger("sendBloodTransfusion")
-    public RespDTO sendBloodTransfusion(@RequestBody List<StrBloodTransfusionVO> list){
-        return aStrBloodTransfusionFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊申请单")
-    @PostMapping("/sendConsultationApply")
-    @SysLogger("sendConsultationApply")
-    public RespDTO sendConsultationApply(@RequestBody List<StrConsultationApplyVO> list){
-        return aStrConsultationApplyFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊单（申请和结果）")
-    @PostMapping("/sendConsultationNote")
-    @SysLogger("sendConsultationNote")
-    public RespDTO sendConsultationNote(@RequestBody List<StrConsultationNoteVO> list){
-        return aStrConsultationNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊记录")
-    @PostMapping("/sendConsultationRecord")
-    @SysLogger("sendConsultationRecord")
-    public RespDTO sendConsultationRecord(@RequestBody List<StrConsultationRecordVO> list){
-        return aStrConsultationRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊结果单")
-    @PostMapping("/sendConsultationResult")
-    @SysLogger("sendConsultationResult")
-    public RespDTO sendConsultationResult(@RequestBody List<StrConsultationResultVO> list){
-        return aStrConsultationResultFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "危急值记录")
-    @PostMapping("/sendCrisisNote")
-    @SysLogger("sendCrisisNote")
-    public RespDTO sendCrisisNote(@RequestBody List<StrCrisisNoteVO> list){
-        return aStrCrisisNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "死亡病例讨论记录")
-    @PostMapping("/sendDeathDiscussion")
-    @SysLogger("sendDeathDiscussion")
-    public RespDTO sendDeathDiscussion(@RequestBody List<StrDeathDiscussionVO> list){
-        return aStrDeathDiscussionFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "死亡记录")
-    @PostMapping("/sendDeathNote")
-    @SysLogger("sendDeathNote")
-    public RespDTO sendDeathNote(@RequestBody List<StrDeathNoteVO> list){
-        return aStrDeathNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "疑难病例讨论记录")
-    @PostMapping("/sendDifficultCase")
-    @SysLogger("sendDifficultCase")
-    public RespDTO sendDifficultCase(@RequestBody List<StrDifficultCaseVO> list){
-        return aStrDifficultCaseFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "首次病程录")
-    @PostMapping("/sendFirstRecord")
-    @SysLogger("sendFirstRecord")
-    public RespDTO sendFirstRecord(@RequestBody List<StrFirstRecordVO> list){
-        return aStrFirstRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "病危通知单")
-    @PostMapping("/sendIllCritically")
-    @SysLogger("sendIllCritically")
-    public RespDTO sendIllCritically(@RequestBody List<StrIllCriticallyVO> list){
-        return aStrIllCriticallyFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "病重通知单")
-    @PostMapping("/sendIllSeriousl")
-    @SysLogger("sendIllSeriousl")
-    public RespDTO sendIllSeriousl(@RequestBody List<StrIllSeriouslVO> list){
-        return aStrIllSeriouslFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "出院小结")
-    @PostMapping("/sendLeaveHospital")
-    @SysLogger("sendLeaveHospital")
-    public RespDTO sendLeaveHospital(@RequestBody List<StrLeaveHospitalVO> list){
-        return aStrLeaveHospitalFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "术后首程")
-    @PostMapping("/sendOperativeFirstRecord")
-    @SysLogger("sendOperativeFirstRecord")
-    public RespDTO sendOperativeFirstRecord(@RequestBody List<StrOperativeFirstRecordVO> list){
-        return aStrOperativeFirstRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "手术记录")
-    @PostMapping("/sendOperativeNote")
-    @SysLogger("sendOperativeNote")
-    public RespDTO sendOperativeNote(@RequestBody List<StrOperativeNoteVO> list){
-        return aStrOperativeNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "查房记录")
-    @PostMapping("/sendWardRecord")
-    @SysLogger("sendWardRecord")
-    public RespDTO sendWardRecord(@RequestBody List<StrWardRecordVO> list){
-        return aStrWardRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "转出记录")
-    @PostMapping("/sendTransferOutNote")
-    @SysLogger("sendTransferOutNote")
-    public RespDTO sendTransferOutNote(@RequestBody List<StrTransferOutNoteVO> list){
-        return aStrTransferOutNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "转入记录")
-    @PostMapping("/sendTransferInNote")
-    @SysLogger("sendTransferInNote")
-    public RespDTO sendTransferInNote(@RequestBody List<StrTransferInNoteVO> list){
-        return aStrTransferInNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "抢救记录")
-    @PostMapping("/sendRescueNote")
-    @SysLogger("sendRescueNote")
-    public RespDTO sendRescueNote(@RequestBody List<StrRescueNoteVO> list){
-        return aStrRescueNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "阶段小结")
-    @PostMapping("/sendPeriodConclusion")
-    @SysLogger("sendPeriodConclusion")
-    public RespDTO sendPeriodConclusion(@RequestBody List<StrPeriodConclusionVO> list){
-        return aStrPeriodConclusionFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "术前讨论小结")
-    @PostMapping("/sendPreoperativeDiscussion")
-    @SysLogger("sendPreoperativeDiscussion")
-    public RespDTO sendPreoperativeDiscussion(@RequestBody List<StrPreoperativeDiscussionVO> list){
-        return aStrPreoperativeDiscussionFacade.execDealData(list);
-    }
-
-}
-*/

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

@@ -2,12 +2,9 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.BasDeptInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.entity.BasHospitalInfo;
 import com.diagbot.facade.BasDoctorInfoFacade;
-import com.diagbot.vo.BasDeptInfoVO;
 import com.diagbot.vo.data.BasDoctorInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -46,11 +46,15 @@ public class DataController {
     private AMedLisResultFacade aMedLisResultFacade;
     @Autowired
     private AMedPacsResultFacade aMedPacsResultFacade;
+    @Autowired
+    private AMedPacsInfoFacade aMedPacsInfoFacade;
+    @Autowired
+    private AMedLisInfoFacade aMedLisInfoFacade;
 
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
-    public RespDTO<List<ABasDoctorInfoDTO>> sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list){
+    public RespDTO sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list){
         return aBasDoctorInfoFacade.executeDoctor(list);
     }
 
@@ -171,20 +175,34 @@ public class DataController {
         return aBehospitalInfoFacade.placeFileFlag(aPlaceFileVO);
     }
 
-    @ApiOperation(value = "检查")
+    @ApiOperation(value = "检查结果")
     @PostMapping("/sendPacsResults")
     @SysLogger("sendPacsResults")
     public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list){
         return aMedPacsResultFacade.executeMedPacsResult(list);
     }
 
-    @ApiOperation(value = "化验")
+    @ApiOperation(value = "化验结果")
     @PostMapping("/sendLisResults")
     @SysLogger("sendLisResults")
     public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list){
         return aMedLisResultFacade.executeMedLisResult(list);
     }
 
+    @ApiOperation(value = "检查信息")
+    @PostMapping("/sendPacsInfos")
+    @SysLogger("sendPacsInfos")
+    public RespDTO sendPacsInfos(@RequestBody List<AMedPacsInfoVO> list){
+        return aMedPacsInfoFacade.dealData(list);
+    }
+
+    @ApiOperation(value = "化验信息")
+    @PostMapping("/sendLisInfos")
+    @SysLogger("sendLisInfos")
+    public RespDTO sendLisInfos(@RequestBody List<AMedLisInfoVO> list){
+        return aMedLisInfoFacade.dealData(list);
+    }
+
     @ApiOperation(value = "数据引擎-历史数据结构化处理")
     @PostMapping("/hisDataDeal")
     @SysLogger("hisDataDeal")

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

@@ -94,6 +94,16 @@ public class DataStrController {
     @Autowired
     private BStrInformedConsentFacade bStrInformedConsentFacade;
 
+    @Autowired
+    private BStrContentFacade bStrContentFacade;
+
+    @ApiOperation(value = "文书内容")
+    @PostMapping("/sendContent")
+    @SysLogger("sendContent")
+    public RespDTO sendContent(@RequestBody StrContentVO strContentVO){
+        return bStrContentFacade.execDealData(strContentVO);
+    }
+
     @ApiOperation(value = "入院记录")
     @PostMapping("/sendAdmissionNote")
     @SysLogger("sendAdmissionNote")

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -275,4 +275,29 @@
         </if>
     </select>
 
+    <update id="updateBatchByKey">
+        <foreach collection="list" item="item"  separator=";">
+            update med_lis_info
+            <set>
+                behospital_code = #{item.behospitalCode},
+                rep_type = #{item.repType},
+                rep_name = #{item.repName},
+                rep_type_name = #{item.repTypeName},
+                slide_type = #{item.slideType},
+                rep_date = #{item.repDate},
+                check_date = #{item.checkDate},
+                apply_doctor = #{item.applyDoctor},
+                dept_id = #{item.deptId},
+                dept_name = #{item.deptName},
+                register_flag = #{item.registerFlag},
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
+            </set>
+            where rep_no = #{item.repNo} and hospital_id = #{item.hospitalId}
+        </foreach>
+    </update>
 </mapper>

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -141,4 +141,33 @@
             and a.behospital_code = #{behospitalCode}
         </if>
     </select>
+
+    <update id="updateBatchByKey">
+        <foreach collection="list" item="item"  separator=";">
+            update med_pacs_info
+            <set>
+                behospital_code = #{item.behospitalCode},
+                rep_name= #{item.repName},
+                rep_type= #{item.repType},
+                rep_type_name= #{item.repTypeName},
+                part= #{item.part},
+                rep_date= #{item.repDate},
+                check_date= #{item.checkDate},
+                apply_doctor= #{item.applyDoctor},
+                dept_id= #{item.deptId},
+                dept_name= #{item.deptName},
+                register_flag= #{item.registerFlag},
+                report_doctor= #{item.reportDoctor},
+                checker= #{item.checker},
+                yjpdz= #{item.yjpdz},
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
+            </set>
+            where rep_no = #{item.repNo} and hospital_id = #{item.hospitalId}
+        </foreach>
+    </update>
 </mapper>