Merge branch 'his/common' into his/tzmh

# Conflicts:
#	src/main/java/com/diagbot/facade/data/ABasDeptInfoFacade.java
#	src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java
#	src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java
#	src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java
#	src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java
#	src/main/java/com/diagbot/facade/data/AHomePageFacade.java
#	src/main/java/com/diagbot/facade/data/AMedCrisisFacade.java
#	src/main/java/com/diagbot/facade/data/AMedicalRecordContentFacade.java
#	src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java
#	src/main/java/com/diagbot/mapper/BasDoctorInfoMapper.java
#	src/main/java/com/diagbot/task/BasDeptInfoTask.java
#	src/main/java/com/diagbot/util/TZDBConn.java
#	src/main/resources/application-local.yml
#	src/main/resources/mapper/BehospitalInfoMapper.xml

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

@@ -145,6 +145,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
+                .antMatchers("/qc/data/deleteFlag").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -3,7 +3,6 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 

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

@@ -0,0 +1,158 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+public class MedAbnormalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "abnormal_id", type = IdType.AUTO)
+    private Long abnormalId;
+
+    /**
+     * 模块名称
+     */
+    private String moduleName;
+
+    /**
+     * 入参
+     */
+    private String paramIn;
+
+    /**
+     * 出参
+     */
+    private String paramOut;
+
+    /**
+     * 异常描述
+     */
+    private String ramark;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public Long getAbnormalId() {
+        return abnormalId;
+    }
+
+    public void setAbnormalId(Long abnormalId) {
+        this.abnormalId = abnormalId;
+    }
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+    public String getParamIn() {
+        return paramIn;
+    }
+
+    public void setParamIn(String paramIn) {
+        this.paramIn = paramIn;
+    }
+    public String getParamOut() {
+        return paramOut;
+    }
+
+    public void setParamOut(String paramOut) {
+        this.paramOut = paramOut;
+    }
+    public String getRamark() {
+        return ramark;
+    }
+
+    public void setRamark(String ramark) {
+        this.ramark = ramark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedAbnormalInfo{" +
+            "abnormalId=" + abnormalId +
+                ", moduleName=" + moduleName +
+            ", paramIn=" + paramIn +
+            ", paramOut=" + paramOut +
+            ", ramark=" + ramark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -71,7 +71,6 @@ public class QcType implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
-
     public Long getHospitalId() {
         return hospitalId;
     }

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

@@ -112,7 +112,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     QcQuestionFacade qcQuestionFacade;
     @Autowired
-    QcModelHospitalFacade qcModelHospitalFacade;
+    ModelHospitalFacade modelHospitalFacade;
     @Autowired
     private FilterFacade filterFacade;
 

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

@@ -1,13 +1,15 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDeptInfoDTO;
 import com.diagbot.entity.BasDeptInfo;
 import com.diagbot.service.impl.BasDeptInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABasDeptInfoVO;
-import com.diagbot.util.BeanUtil;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -23,6 +25,9 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
     @Qualifier("basDeptInfoServiceImpl")
     private BasDeptInfoServiceImpl basDeptInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -49,53 +54,60 @@ 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();
+                List<ABasDeptInfoDTO> basDeptInfoDtoList=Lists.newArrayList();
+                basDeptInfoList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+                basDeptInfoDtoList=BeanUtil.listCopyTo(list,ABasDeptInfoDTO.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("请输入科室名称!");
+                //循环验证数据有效性
+                for (BasDeptInfo basDeptInfo:basDeptInfoList) {
+                    if(StringUtil.isEmpty(basDeptInfo.getDeptId())) {
+                        return RespDTO.onError("请输入科室编码!");
+                    }else if(basDeptInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(basDeptInfo.getDeptName())){
+                        return RespDTO.onError("请输入科室名称!");
+                    }
                 }
+                execute(basDeptInfoList);
+                return RespDTO.onSuc(basDeptInfoDtoList);
+            }else {
+                aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
             }
-            execute(basDeptInfoList);
-            return RespDTO.onSuc(basDeptInfoDtoList);
-        }else {
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<BasDeptInfo> basDeptInfoList){
-        long startTime=System.currentTimeMillis();
-        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);
+        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()));
+                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(updateE.size()>0){
-            basDeptInfoService.updateBatchByKey(updateE);
-        }
-        if(addE.size()>0){
-            basDeptInfoService.saveBatch(addE);
+            if(addE.size()>0){
+                basDeptInfoService.saveBatch(addE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(basDeptInfoList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息",JSON.toJSONString(basDeptInfoList),"",e.getMessage());
         }
-
-        long endTime=System.currentTimeMillis();
-        System.out.println("程序运行时间： "+(endTime - startTime)+"ms");
     }
 }

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

@@ -1,11 +1,13 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDoctorInfoDTO;
 import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABasDoctorInfoVO;
 import com.google.common.collect.Lists;
@@ -22,6 +24,9 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     @Qualifier("basDoctorInfoServiceImpl")
     private BasDoctorInfoServiceImpl basDoctorInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -47,50 +52,57 @@ 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();
+                List<ABasDoctorInfoDTO> basDoctorDtoList=Lists.newArrayList();
+                basDoctorInfoList=BeanUtil.listCopyTo(list,BasDoctorInfo.class);
+                basDoctorDtoList=BeanUtil.listCopyTo(list,ABasDoctorInfoDTO.class);
+                //循环验证数据有效性
+                for (BasDoctorInfo basDoctorInfo:basDoctorInfoList) {
+                    if(StringUtil.isEmpty(basDoctorInfo.getDoctorId())) {
+                        return RespDTO.onError("请输入医生编码!");
+                    }else if(basDoctorInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }
                 }
+                execute(basDoctorInfoList);
+                return RespDTO.onSuc(basDoctorDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
             }
-            execute(basDoctorInfoList);
-            return RespDTO.onSuc(basDoctorDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<BasDoctorInfo> basDoctorInfoList){
-        long startTime=System.currentTimeMillis();
-        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);
+        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(updateE.size()>0){
-            basDoctorInfoService.updateBatchByKey(updateE);
-        }
-        if(addE.size()>0){
-            basDoctorInfoService.saveBatch(addE);
+            if(addE.size()>0){
+                basDoctorInfoService.saveBatch(addE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(basDoctorInfoList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息",JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
         }
-
-        long endTime=System.currentTimeMillis();
-        System.out.println("程序运行时间： "+(endTime - startTime)+"ms");
     }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -9,7 +10,10 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
-import com.diagbot.util.*;
+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.ABehospitalInfoVO;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.google.common.collect.Lists;
@@ -33,6 +37,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     private AMedicalRecordFacade aMedicalRecordFacade;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     @Autowired
     private QcAbnormalFacade qcAbnormalFacade;
 
@@ -64,73 +71,82 @@ 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()));
-                }
-                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("请输入住院科室名称!");
+        try {
+            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()));
+                    }
+                    behospitalInfoList.add(behospitalInfo);
+
+                });
+
+                //循环验证数据有效性
+                for (BehospitalInfo behospitalInfo:behospitalInfoList) {
+                    if(StringUtil.isEmpty(behospitalInfo.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }else if(behospitalInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(behospitalInfo.getBehDeptId())){
+                        return RespDTO.onError("请输入住院科室编码!");
+                    }else if(StringUtil.isEmpty(behospitalInfo.getBehDeptName())){
+                        return RespDTO.onError("请输入住院科室名称!");
+                    }
                 }
+                execute(behospitalInfoList);
+                behospitalInfoDtoList = BeanUtil.listCopyTo(list, ABehospitalInfoDTO.class);
+                return RespDTO.onSuc(behospitalInfoDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
             }
-            execute(behospitalInfoList);
-            behospitalInfoDtoList = BeanUtil.listCopyTo(list, ABehospitalInfoDTO.class);
-            return RespDTO.onSuc(behospitalInfoDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<BehospitalInfo> behospitalInfoList){
-        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);
+        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()), 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(addE.size()>0){
-            behospitalInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            behospitalInfoService.updateBatchByKey(updateE);
+            if(updateE.size()>0){
+                behospitalInfoService.updateBatchByKey(updateE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(behospitalInfoList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记",JSON.toJSONString(behospitalInfoList),"",e.getMessage());
         }
-
     }
 
     /**
@@ -140,58 +156,69 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
      */
     private Long initQcTypeId(BehospitalInfo s){
         Long qcTypeId=Long.valueOf("0");
-        MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
-                .eq("behospital_code", s.getBehospitalCode())
-                .eq("hospital_id", s.getHospitalId())
-                .eq("mode_id", Long.valueOf("1"))
-                .eq("is_deleted",IsDeleteEnum.N), false);
-        if(medicalRecord!=null){
-            QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
-                    .eq("name",medicalRecord.getRecTitle())
+        try {
+            MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
+                    .eq("behospital_code", s.getBehospitalCode())
                     .eq("hospital_id", s.getHospitalId())
+                    .eq("mode_id", Long.valueOf("1"))
                     .eq("is_deleted",IsDeleteEnum.N), false);
-            if(qcType!=null){
-                qcTypeId=qcType.getId();
-            }else{
-                //新增类型到qc_type表中
-                QcType qctype=new QcType();
-                qctype.setHospitalId(s.getHospitalId());
-                qctype.setName(medicalRecord.getRecTitle());
-                qctype.setGmtCreate(new Date());
-
-                Long id=qcTypeFacade.saveT(qctype);
-                qcTypeId=id;
-
-                //新增类型到监测表中
-                QcAbnormal qcAbnormal=new QcAbnormal();
-                qcAbnormal.setHospitalId(s.getHospitalId());
-                qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-                qcAbnormal.setType(2);
-                qcAbnormal.setDescription(medicalRecord.getRecTitle());
-                qcAbnormal.setGmtCreate(new Date());
-                qcAbnormalFacade.getBaseMapper().insert(qcAbnormal);
+            if(medicalRecord!=null){
+                QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
+                        .eq("name",medicalRecord.getRecTitle())
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N), false);
+                if(qcType!=null){
+                    qcTypeId=qcType.getId();
+                }else{
+                    //新增类型到qc_type表中
+                    QcType qctype=new QcType();
+                    qctype.setHospitalId(s.getHospitalId());
+                    qctype.setName(medicalRecord.getRecTitle());
+                    qctype.setGmtCreate(new Date());
+
+                    Long id=qcTypeFacade.saveT(qctype);
+                    qcTypeId=id;
+
+                    //新增类型到监测表中
+                    QcAbnormal qcAbnormal=new QcAbnormal();
+                    qcAbnormal.setHospitalId(s.getHospitalId());
+                    qcAbnormal.setBehospitalCode(s.getBehospitalCode());
+                    qcAbnormal.setType(2);
+                    qcAbnormal.setDescription(medicalRecord.getRecTitle());
+                    qcAbnormal.setGmtCreate(new Date());
+                    qcAbnormalFacade.getBaseMapper().insert(qcAbnormal);
+                }
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-qctypeid初始化",JSON.toJSONString(s),qcTypeId.toString(),"操作正常!");
+            return qcTypeId;
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-qctypeid初始化异常",JSON.toJSONString(s),"",e.getMessage());
+            return qcTypeId;
         }
-        return qcTypeId;
     }
 
-
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())){
-            return RespDTO.onError("请输入病人住院编码!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-        }else {
-            UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
-
-            Boolean flag=update(new BehospitalInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new BehospitalInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"","删除成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -28,6 +29,9 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     @Qualifier("doctorAdviceServiceImpl")
     private DoctorAdviceServiceImpl doctorAdviceService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -51,84 +55,101 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
      * @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("请输入病人住院编码!");
+        try {
+            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{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(list),"","未接收到数据!");
+                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("未接收到数据!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     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);
+        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(addE.size()>0){
+                doctorAdviceService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                doctorAdviceService.updateBatchByKey(updateE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(doctorAdviceList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱",JSON.toJSONString(doctorAdviceList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isBlank(aDeleteFlagVO.getDoctorAdviceId())) {
-            return RespDTO.onError("请输入病人医嘱编码!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-        }else if(StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())){
-            return RespDTO.onError("请输入病人住院编码!");
-        }else {
-            UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("doctor_advice_id", aDeleteFlagVO.getDoctorAdviceId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getDoctorAdviceId())) {
+                return RespDTO.onError("请输入病人医嘱编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("doctor_advice_id", aDeleteFlagVO.getDoctorAdviceId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new DoctorAdvice(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new DoctorAdvice(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -28,6 +29,9 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     @Qualifier("homeDiagnoseInfoServiceImpl")
     private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -47,66 +51,84 @@ 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();
+        try {
+            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("未接收到数据!");
+                homeDiagnoseList=BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
+                homeDiagnoseDtoList=BeanUtil.listCopyTo(list,AHomeDiagnoseDTO.class);
+                execute(homeDiagnoseList);
+                return RespDTO.onSuc(homeDiagnoseDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<HomeDiagnoseInfo> homeDiagnoseList){
-        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);
+        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);
+                        }
                     }
-                }
-            });
-        }
-        if(addE.size()>0){
-            homeDiagnoseInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            homeDiagnoseInfoService.updateBatchByKey(updateE);
+                });
+            }
+            if(addE.size()>0){
+                homeDiagnoseInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homeDiagnoseInfoService.updateBatchByKey(updateE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(homeDiagnoseList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断",JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
         }
+
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isBlank(aDeleteFlagVO.getHomePageId())) {
-            return RespDTO.onError("出院诊断未输入病案首页编号!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("出院诊断未输入医院编码!");
-        }else if(StringUtil.isBlank(aDeleteFlagVO.getDiagnoseOrderNo())){
-            return RespDTO.onError("出院诊断未输入顺序号!");
-        }else {
-            UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("diagnose_order_no", aDeleteFlagVO.getDiagnoseOrderNo())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("出院诊断未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("出院诊断未输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getDiagnoseOrderNo())){
+                return RespDTO.onError("出院诊断未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("diagnose_order_no", aDeleteFlagVO.getDiagnoseOrderNo())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new HomeDiagnoseInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new HomeDiagnoseInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -28,6 +29,9 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     @Qualifier("homeOperationInfoServiceImpl")
     private HomeOperationInfoServiceImpl homeOperationInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -63,53 +67,64 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     }
 
     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);
+        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);
+                        }
                     }
-                }
-            });
-        }
-        if(addE.size()>0){
-            homeOperationInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            homeOperationInfoService.updateBatchByKey(updateE);
+                });
+            }
+            if(addE.size()>0){
+                homeOperationInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homeOperationInfoService.updateBatchByKey(updateE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术",JSON.toJSONString(homeOperationList),"","操作正常!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术",JSON.toJSONString(homeOperationList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isBlank(aDeleteFlagVO.getHomePageId())) {
-            return RespDTO.onError("住院手术未输入病案首页编号!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("住院手术未输入医院编码!");
-        }else if(StringUtil.isBlank(aDeleteFlagVO.getOperationOrderNo())){
-            return RespDTO.onError("住院手术未输入顺序号!");
-        }else {
-            UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("住院手术未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("住院手术未输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getOperationOrderNo())){
+                return RespDTO.onError("住院手术未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new HomeOperationInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new HomeOperationInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

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

@@ -1,17 +1,32 @@
 package com.diagbot.facade.data;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+<<<<<<<<< Temporary merge branch 1
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.data.AHomePageDTO;
+import com.diagbot.entity.HomeDiagnoseInfo;
+import com.diagbot.entity.HomeOperationInfo;
+=========
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
+>>>>>>>>> Temporary merge branch 2
 import com.diagbot.entity.HomePage;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.service.impl.HomePageServiceImpl;
-import com.diagbot.util.*;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ReadProperties;
+import com.diagbot.util.TZDBConn;
+<<<<<<<<< Temporary merge branch 1
+import com.diagbot.vo.AnalyzeApiVO;
+=========
 import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.data.*;
+>>>>>>>>> Temporary merge branch 2
+import com.diagbot.vo.data.AHomeDiagnoseVO;
+import com.diagbot.vo.data.AHomeOperationVO;
+import com.diagbot.vo.data.AHomePageIngVO;
+import com.diagbot.vo.data.AHomePageVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -43,6 +58,8 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
     private TZDBConn tzDBConn = new TZDBConn();
 
+<<<<<<<<< Temporary merge branch 1
+=========
     /*public static void main(String[] args){
         int mod=Math.floorMod(5012,500);
         int div=Math.floorDiv(5012,500);
@@ -55,6 +72,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
         }
     }*/
 
+>>>>>>>>> Temporary merge branch 2
     /**
      * 同步前一天病案首页
      */
@@ -63,6 +81,8 @@ public class AHomePageFacade extends HomePageServiceImpl{
         //同步前一天的数据
         String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
         List<HomePage> homePageList = tzDBConn.getHomePage(sql);
+<<<<<<<<< Temporary merge branch 1
+=========
         /*
         int mod=Math.floorMod(homePageList.size(),500);
         int div=Math.floorDiv(homePageList.size(),500);
@@ -72,6 +92,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             execute(homePageList);
         }
         */
+>>>>>>>>> Temporary merge branch 2
         execute(homePageList);
     }
 
@@ -137,25 +158,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             //初始化入参
             HomePage homePage=new HomePage();
             BeanUtil.copyProperties(s,homePage);
-            if(StringUtil.isNotBlank(s.getSex())){
-                if(s.getSex().equals("1")){
-                    homePage.setSex("男");
-                }else if(s.getSex().equals("2")){
-                    homePage.setSex("女");
-                }
-            }
-            if(StringUtil.isNotBlank(s.getBirthday())){
-                homePage.setBirthday(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBirthday(),"yyyy/MM/dd"))));
-            }
-            if(StringUtil.isNotBlank(s.getBehospitalDate())){
-                homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy/MM/dd HH:mm"))));
-            }
-            if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
-                homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm"))));
-            }
-            if(StringUtil.isNotBlank(s.getQcDate())){
-                homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd"))));
-            }
+            homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
             homePageList.add(homePage);
 
             //初始化诊断和手术，并同步到数据库
@@ -174,18 +177,29 @@ public class AHomePageFacade extends HomePageServiceImpl{
         String behospitalCode =aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
         Long hospitalId=aHomePageIngVO.getHomePages().get(0).getHospitalId();
         Long modeId=Long.valueOf("6");//病案首页默认为6
+<<<<<<<<< Temporary merge branch 1
+        if(aHomePageIngVO.getDockModeType().equals("1")){
+=========
         if(aHomePageIngVO.getDockModeType().equals("0")){
             Map<String,Object> map=new HashMap<String,Object>();
             List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
             map.put("homePages",homePageDtoList);
             return RespDTO.onSuc(map);
         }else if(aHomePageIngVO.getDockModeType().equals("1")){
+>>>>>>>>> Temporary merge branch 2
             //页面模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
             Map<String,Object> map=new HashMap<String,Object>();
             map.put("url",url);
             return RespDTO.onSuc(map);
         }else if(aHomePageIngVO.getDockModeType().equals("2")){
+<<<<<<<<< Temporary merge branch 1
+            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
+            analyzeApiVO.setBehospitalCode(behospitalCode);
+            analyzeApiVO.setHospitalId(hospitalId);
+            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
+            //接口引擎模式
+=========
             AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
             analyzeRunVO.setBehospitalCode(behospitalCode);
             analyzeRunVO.setHospitalId(hospitalId);
@@ -195,11 +209,21 @@ public class AHomePageFacade extends HomePageServiceImpl{
             if(analyzeRunDTO.getMsgDTOList().size()>0){
                 map.put("analyze",analyzeRunDTO.getMsgDTOList());
             }
+>>>>>>>>> Temporary merge branch 2
             return RespDTO.onSuc(map);
         }else{
             //页面模式+接口引擎模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
 
+<<<<<<<<< Temporary merge branch 1
+            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
+            analyzeApiVO.setBehospitalCode(behospitalCode);
+            analyzeApiVO.setHospitalId(hospitalId);
+            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
+
+            map.put("url",url);
+
+=========
             AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
             analyzeRunVO.setBehospitalCode(behospitalCode);
             analyzeRunVO.setHospitalId(hospitalId);
@@ -210,6 +234,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 map.put("url",url);
                 map.put("analyze",analyzeRunDTO.getMsgDTOList());
             }
+>>>>>>>>> Temporary merge branch 2
             return RespDTO.onSuc(map);
         }
     }
@@ -238,20 +263,10 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 //初始化入参
                 HomePage homePage=new HomePage();
                 BeanUtil.copyProperties(s,homePage);
-                if(StringUtil.isNotBlank(s.getBirthday())){
-                    homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
-                }
-                if(StringUtil.isNotBlank(s.getBehospitalDate())){
-                    homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
-                }
-                if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
-                    //homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
-                    homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm"))));
-                }
-                if(StringUtil.isNotBlank(s.getQcDate())){
-                    //homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd HH:mm:ss"))));
-                    homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd"))));
-                }
+                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                homePage.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
+                homePage.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
+                homePage.setQcDate(DateUtil.parseDateTime(s.getQcDate()));
                 homePageList.add(homePage);
             });
             execute(homePageList);
@@ -274,7 +289,11 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 HomePage homePage = this.getOne(new QueryWrapper<HomePage>()
                         .eq("home_page_id", s.getHomePageId())
                         .eq("hospital_id", s.getHospitalId())
+<<<<<<<<< Temporary merge branch 1
+                        .eq("behospital_code", s.getBehospitalCode()));
+=========
                         .eq("behospital_code", s.getBehospitalCode()), false);
+>>>>>>>>> Temporary merge branch 2
                 if (homePage != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);
@@ -291,26 +310,4 @@ public class AHomePageFacade extends HomePageServiceImpl{
             homePageService.updateBatchByKey(updateE);
         }
     }
-
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-       if(StringUtil.isBlank(aDeleteFlagVO.getHomePageId())) {
-            return RespDTO.onError("请输入病案首页编号!");
-       }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-       }else if(StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())){
-            return RespDTO.onError("请输入病人住院编码!");
-       }else {
-            UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
-
-            Boolean flag=update(new HomePage(),updateWrapper);
-            return RespDTO.onSuc(flag);
-       }
-    }
 }

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

@@ -0,0 +1,26 @@
+package com.diagbot.facade.data;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.diagbot.service.impl.MedAbnormalInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class AMedAbnormalInfoFacade extends MedAbnormalInfoServiceImpl {
+    /**
+     * 接口日志记录
+     * @param paramIn
+     * @param paramOut
+     * @param remark
+     */
+    public void saveAbnormalInfo(String moduleName,String paramIn,String paramOut,String remark){
+        MedAbnormalInfo medAbnormalInfo=new MedAbnormalInfo();
+        medAbnormalInfo.setModuleName(moduleName);
+        medAbnormalInfo.setParamIn(paramIn);
+        medAbnormalInfo.setParamOut(paramOut);
+        medAbnormalInfo.setRamark(remark);
+        medAbnormalInfo.setGmtCreate(new Date());
+        this.save(medAbnormalInfo);
+    }
+}

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

@@ -1,5 +1,6 @@
 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;
@@ -27,84 +28,104 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
     @Qualifier("medCrisisInfoServiceImpl")
     private MedCrisisInfoServiceImpl medCrisisInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     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("未接收到数据!");
+                List<AMedCrisisDTO> medCrisisDtoList=BeanUtil.listCopyTo(list,AMedCrisisDTO.class);
+                return RespDTO.onSuc(medCrisisDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<MedCrisisInfo> medCrisisList){
-        List<MedCrisisInfo> addE = Lists.newLinkedList();
-        List<MedCrisisInfo> updateE = Lists.newLinkedList();
-        if (medCrisisList != null && medCrisisList.size() > 0) {
-            medCrisisList.stream().forEach(s -> {
-                MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
-                .eq("rec_id", s.getRecId())
-                .eq("hospital_id", s.getHospitalId())
-                .eq("behospital_code", s.getBehospitalCode())
-                .eq("rec_type", s.getRecType()), false);
-                if (medCrisisInfo != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            medCrisisInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            medCrisisInfoService.updateBatchByKey(updateE);
+        try {
+            List<MedCrisisInfo> addE = Lists.newLinkedList();
+            List<MedCrisisInfo> updateE = Lists.newLinkedList();
+            if (medCrisisList != null && medCrisisList.size() > 0) {
+                medCrisisList.stream().forEach(s -> {
+                    MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
+                            .eq("rec_id", s.getRecId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code", s.getBehospitalCode())
+                            .eq("rec_type", s.getRecType()), false);
+                    if (medCrisisInfo != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                medCrisisInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                medCrisisInfoService.updateBatchByKey(updateE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(medCrisisList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值",JSON.toJSONString(medCrisisList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isBlank(aDeleteFlagVO.getRecId())){
-            return RespDTO.onError("请输入文书编码!");
-        }else if(StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())) {
-            return RespDTO.onError("请输入病人住院编码!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-        }else {
-            UpdateWrapper<MedCrisisInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getRecId())){
+                return RespDTO.onError("请输入文书编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedCrisisInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new MedCrisisInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new MedCrisisInfo(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("危急值-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值-删除",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -28,6 +29,9 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
     @Autowired
     private MedicalRecordContentServiceImpl medicalRecordContentService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -46,59 +50,76 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
      * @return
      */
     public RespDTO<List<AMedicalRecordContentDTO>> executeMrRecordContent(List<AMedicalRecordContentVO> list) {
-        if(list!=null && list.size()>0) {
-            List<MedicalRecordContent> mrContentList=BeanUtil.listCopyTo(list,MedicalRecordContent.class);
-            List<AMedicalRecordContentDTO> mrContentDtoList=BeanUtil.listCopyTo(list,AMedicalRecordContentDTO.class);
-            execute(mrContentList);
-            return RespDTO.onSuc(mrContentDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        try {
+            if(list!=null && list.size()>0) {
+                List<MedicalRecordContent> mrContentList=BeanUtil.listCopyTo(list,MedicalRecordContent.class);
+                List<AMedicalRecordContentDTO> mrContentDtoList=BeanUtil.listCopyTo(list,AMedicalRecordContentDTO.class);
+                execute(mrContentList);
+                return RespDTO.onSuc(mrContentDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
+
     }
 
     public void execute(List<MedicalRecordContent> mrContentList){
-        List<MedicalRecordContent> addE = Lists.newLinkedList();
-        List<MedicalRecordContent> updateE = Lists.newLinkedList();
-        if (mrContentList != null && mrContentList.size() > 0) {
-            mrContentList.stream().forEach(s -> {
-                QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("rec_id", s.getRecId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                MedicalRecordContent mrContent = this.getOne(queryWrapper, false);
-                if (mrContent != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            medicalRecordContentService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            medicalRecordContentService.updateBatchByKey(updateE);
+        try {
+            List<MedicalRecordContent> addE = Lists.newLinkedList();
+            List<MedicalRecordContent> updateE = Lists.newLinkedList();
+            if (mrContentList != null && mrContentList.size() > 0) {
+                mrContentList.stream().forEach(s -> {
+                    QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("rec_id", s.getRecId());
+                    queryWrapper.eq("hospital_id", s.getHospitalId());
+                    MedicalRecordContent mrContent = this.getOne(queryWrapper, false);
+                    if (mrContent != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                medicalRecordContentService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                medicalRecordContentService.updateBatchByKey(updateE);
+            }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(mrContentList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(mrContentList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if (StringUtil.isBlank(aDeleteFlagVO.getRecId())) {
-            return RespDTO.onError("请输入文书序号!");
-        } else if (aDeleteFlagVO.getHospitalId() == null) {
-            return RespDTO.onError("请输入医院编码!");
-        }else {
-            UpdateWrapper<MedicalRecordContent> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if (StringUtil.isEmpty(aDeleteFlagVO.getRecId())) {
+                return RespDTO.onError("请输入文书序号!");
+            } else if (aDeleteFlagVO.getHospitalId() == null) {
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedicalRecordContent> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new MedicalRecordContent(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new MedicalRecordContent(),updateWrapper);
+                aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

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

@@ -1,21 +1,35 @@
 package com.diagbot.facade.data;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+<<<<<<<<< Temporary merge branch 1
+=========
 import com.diagbot.dto.AnalyzeRunDTO;
+>>>>>>>>> Temporary merge branch 2
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.dto.data.AMrContentDTO;
 import com.diagbot.entity.*;
+<<<<<<<<< Temporary merge branch 1
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.ModelHospitalFacade;
+import com.diagbot.facade.QcAbnormalFacade;
+=========
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
+>>>>>>>>> Temporary merge branch 2
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
-import com.diagbot.util.*;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ReadProperties;
+import com.diagbot.util.TZDBConn;
+<<<<<<<<< Temporary merge branch 1
+import com.diagbot.vo.AnalyzeApiVO;
+=========
 import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.data.ADeleteFlagVO;
+>>>>>>>>> Temporary merge branch 2
 import com.diagbot.vo.data.AMedicalRecordVO;
 import com.diagbot.vo.data.AMrContentVO;
 import com.google.common.collect.Lists;
@@ -152,12 +166,16 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         MedicalRecord medicalRecord=new MedicalRecord();
         BeanUtil.copyProperties(aMrContentVO.getRecords().get(0),medicalRecord);
         Long modeId=initModeId(medicalRecord);
+<<<<<<<<< Temporary merge branch 1
+        if(aMrContentVO.getDockModeType().equals("1")){
+=========
         if(aMrContentVO.getDockModeType().equals("0")){
             Map<String,Object> map=new HashMap<String,Object>();
             List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(aMrContentVO.getRecords(), AMedicalRecordDTO.class);
             map.put("records",medicalRecordDTOList);
             return RespDTO.onSuc(map);
         }else if(aMrContentVO.getDockModeType().equals("1")){
+>>>>>>>>> Temporary merge branch 2
             if(modeId==0 || modeId==null){
                 return RespDTO.onError("无对应的文书类型");
             }
@@ -167,6 +185,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             map.put("url",url);
             return RespDTO.onSuc(map);
         }else if(aMrContentVO.getDockModeType().equals("2")){
+<<<<<<<<< Temporary merge branch 1
+            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
+            analyzeApiVO.setBehospitalCode(behospitalCode);
+            analyzeApiVO.setHospitalId(hospitalId);
+            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
+=========
             AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
             analyzeRunVO.setBehospitalCode(behospitalCode);
             analyzeRunVO.setHospitalId(hospitalId);
@@ -176,6 +200,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             if(analyzeRunDTO.getMsgDTOList().size()>0){
                 map.put("analyze",analyzeRunDTO.getMsgDTOList());
             }
+>>>>>>>>> Temporary merge branch 2
             //接口引擎模式
             return RespDTO.onSuc(map);
         }else{
@@ -185,6 +210,15 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             //页面模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
 
+<<<<<<<<< Temporary merge branch 1
+            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
+            analyzeApiVO.setBehospitalCode(behospitalCode);
+            analyzeApiVO.setHospitalId(hospitalId);
+            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
+
+            map.put("url",url);
+
+=========
             AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
             analyzeRunVO.setBehospitalCode(behospitalCode);
             analyzeRunVO.setHospitalId(hospitalId);
@@ -195,6 +229,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 map.put("url",url);
                 map.put("analyze",analyzeRunDTO.getMsgDTOList());
             }
+>>>>>>>>> Temporary merge branch 2
             return RespDTO.onSuc(map);
         }
     }
@@ -221,14 +256,22 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
                     BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
                             .eq("behospital_code", s.getBehospitalCode())
+<<<<<<<<< Temporary merge branch 1
+                            .eq("hospital_id", s.getHospitalId()));
+=========
                             .eq("hospital_id", s.getHospitalId()), false);
+>>>>>>>>> Temporary merge branch 2
                     if(behospitalInfo!=null){
                         //如果病人住院信息存在，更新对应的qc_type_id
                         Long qcTypeId=Long.valueOf("0");
                         QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                                 .eq("name",s.getRecTitle())
+<<<<<<<<< Temporary merge branch 1
+                                .eq("hospital_id", s.getHospitalId()));
+=========
                                 .eq("hospital_id", s.getHospitalId())
                                 .eq("is_deleted",IsDeleteEnum.N), false);
+>>>>>>>>> Temporary merge branch 2
                         if(qcType!=null){
                             behospitalInfo.setQcTypeId(qcType.getId());
                         }else{
@@ -258,7 +301,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
                         .eq("rec_id", s.getRecId())
                         .eq("hospital_id", s.getHospitalId())
+<<<<<<<<< Temporary merge branch 1
+                        .eq("behospital_code", s.getBehospitalCode()));
+=========
                         .eq("behospital_code", s.getBehospitalCode()), false);
+>>>>>>>>> Temporary merge branch 2
                 if (mRecord != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);
@@ -293,7 +340,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
         wrapper.eq("hospital_id",medicalRecord.getHospitalId());
         wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
+<<<<<<<<< Temporary merge branch 1
+        ModelHospital mode=modelHospitalFacade.getOne(wrapper);
+=========
         ModelHospital mode=modelHospitalFacade.getOne(wrapper, false);
+>>>>>>>>> Temporary merge branch 2
         if(mode!=null){
             modeId=mode.getStandModelId();
         }else{
@@ -302,38 +353,4 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         return modeId;
     }
 
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if (StringUtil.isBlank(aDeleteFlagVO.getRecId())) {
-            return RespDTO.onError("请输入文书序号!");
-        } else if (aDeleteFlagVO.getHospitalId() == null) {
-            return RespDTO.onError("请输入医院编码!");
-        } else if (StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())) {
-            return RespDTO.onError("请输入病人住院编码!");
-        }else {
-            UpdateWrapper<MedicalRecord> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
-
-            Boolean flag=update(new MedicalRecord(),updateWrapper);
-
-            if(true){
-                UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();
-                updateWrapperContent.eq("rec_id", aDeleteFlagVO.getRecId())
-                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                        .eq("is_deleted",IsDeleteEnum.N)
-                        .set("is_deleted",IsDeleteEnum.Y)
-                        .set("gmt_modified", DateUtil.now());
-
-                Boolean flagContent=aMedicalRecordContentFacade.update(new MedicalRecordContent(),updateWrapperContent);
-                return RespDTO.onSuc(flagContent);
-            }
-            return RespDTO.onSuc(flag);
-        }
-    }
-
 }

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

@@ -14,5 +14,7 @@ import java.util.List;
  * @since 2020-04-17
  */
 public interface BasDoctorInfoMapper extends BaseMapper<BasDoctorInfo> {
+
     public void updateBatchByKey(List<BasDoctorInfo> list);
+
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+public interface MedAbnormalInfoMapper extends BaseMapper<MedAbnormalInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+public interface MedAbnormalInfoService extends IService<MedAbnormalInfo> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.diagbot.mapper.MedAbnormalInfoMapper;
+import com.diagbot.service.MedAbnormalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+@Service
+public class MedAbnormalInfoServiceImpl extends ServiceImpl<MedAbnormalInfoMapper, MedAbnormalInfo> implements MedAbnormalInfoService {
+
+}

src/main/java/com/diagbot/task/BasDeptInfoTask.java

@@ -47,7 +47,7 @@ public class BasDeptInfoTask implements SchedulingConfigurer{
                         && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    aBasDeptInfoFacade.executeDept();
+                    //aBasDeptInfoFacade.executeDept();
                 }
             }
         }, new Trigger() {

src/main/resources/jdbc.properties

@@ -18,7 +18,7 @@ jdbc.password=zjlt@2020
 remote.address.ver=http://192.18.101.207:2030/index.html
 remote.address.hor=http://192.18.101.207:2030/indexHorizontal.html
 
-process.qc.url=http://192.168.100.157:1489/index.html
+process.qc.url=http://192.168.2.132:1489/index.html
 
 #his\u65b9\u60a3\u8005\u63a5\u53e3\u5730\u5740
 his.patient.url=

src/main/resources/mapper/BasDeptInfoMapper.xml

@@ -81,21 +81,11 @@
         <foreach collection="list" item="item"  separator=";">
             update bas_dept_info
             <set>
-                <if test="item.parentDeptId != null">
-                    parent_dept_id = #{item.parentDeptId},
-                </if>
-                <if test="item.deptName != null">
-                    dept_name = #{item.deptName},
-                </if>
-                <if test="item.deptType != null">
+                  parent_dept_id = #{item.parentDeptId},
+                  dept_name = #{item.deptName},
                     dept_type = #{item.deptType},
-                </if>
-                <if test="item.spell != null">
                     spell = #{item.spell},
-                </if>
-                <if test="item.station != null">
                     station = #{item.station},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/BasDoctorInfoMapper.xml

@@ -21,18 +21,10 @@
         <foreach collection="list" item="item"  separator=";">
             update bas_doctor_info
             <set>
-                <if test="item.deptId != null">
                     dept_id = #{item.deptId},
-                </if>
-                <if test="item.name != null">
                     name = #{item.name},
-                </if>
-                <if test="item.professor != null">
                     professor = #{item.professor},
-                </if>
-                <if test="item.occup != null">
                     occup = #{item.occup},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2903,81 +2903,31 @@
         <foreach collection="list" item="item"  separator=";">
             update med_behospital_info
             <set>
-                <if test="item.name != null">
                     name = #{item.name},
-                </if>
-                <if test="item.sex != null">
                     sex = #{item.sex},
-                </if>
-                <if test="item.birthday != null">
                     birthday = #{item.birthday},
-                </if>
-                <if test="item.fileCode != null">
                     file_code = #{item.fileCode},
-                </if>
-                <if test="item.qcTypeId != null">
                     qc_type_id = #{item.qcTypeId},
-                </if>
-                <if test="item.wardCode != null">
                     ward_code = #{item.wardCode},
-                </if>
-                <if test="item.wardName != null">
                     ward_name = #{item.wardName},
-                </if>
-                <if test="item.behDeptId != null">
                     beh_dept_id = #{item.behDeptId},
-                </if>
-                <if test="item.behDeptName != null">
                     beh_dept_name = #{item.behDeptName},
-                </if>
-                <if test="item.bedCode != null">
                     bed_code = #{item.bedCode},
-                </if>
-                <if test="item.bedName != null">
                     bed_name = #{item.bedName},
-                </if>
-                <if test="item.insuranceName != null">
                     insurance_name = #{item.insuranceName},
-                </if>
-                <if test="item.jobType != null">
                     job_type = #{item.jobType},
-                </if>
-                <if test="item.behospitalDate != null">
                     behospital_date = #{item.behospitalDate},
-                </if>
-                <if test="item.leaveHospitalDate != null">
                     leave_hospital_date = #{item.leaveHospitalDate},
-                </if>
-                <if test="item.diagnoseIcd != null">
                     diagnose_icd = #{item.diagnoseIcd},
-                </if>
-                <if test="item.diagnose != null">
                     diagnose = #{item.diagnose},
-                </if>
-                <if test="item.behDoctorId != null">
                     beh_doctor_id = #{item.behDoctorId},
-                </if>
-                <if test="item.behDoctorName != null">
                     beh_doctor_name = #{item.behDoctorName},
-                </if>
-                <if test="item.doctorId != null">
                     doctor_id = #{item.doctorId},
-                </if>
-                <if test="item.doctorName != null">
                     doctor_name = #{item.doctorName},
-                </if>
-                <if test="item.directorDoctorId != null">
                     director_doctor_id = #{item.directorDoctorId},
-                </if>
-                <if test="item.directorDoctorName != null">
                     director_doctor_name = #{item.directorDoctorName},
-                </if>
-                <if test="item.placefileDate != null">
                     placefile_date = #{item.placefileDate},
-                </if>
-                <if test="item.isPlacefile != null">
                     is_placefile = #{item.isPlacefile},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -41,72 +41,28 @@
         <foreach collection="list" item="item"  separator=";">
             update med_doctor_advice
             <set>
-                <if test="item.orderDoctorName != null">
                     order_doctor_name = #{item.orderDoctorName},
-                </if>
-                <if test="item.frequency != null">
                     frequency = #{item.frequency},
-                </if>
-                <if test="item.parentTypeId != null">
                     parent_type_id = #{item.parentTypeId},
-                </if>
-                <if test="item.doctorAdviceType != null">
                     doctor_advice_type = #{item.doctorAdviceType},
-                </if>
-                <if test="item.usageNum != null">
                     usage_num = #{item.usageNum},
-                </if>
-                <if test="item.usageUnit != null">
                     usage_unit = #{item.usageUnit},
-                </if>
-                <if test="item.dose != null">
                     dose = #{item.dose},
-                </if>
-                <if test="item.doseUnit != null">
                     dose_unit = #{item.doseUnit},
-                </if>
-                <if test="item.medModeType != null">
                     med_mode_type = #{item.medModeType},
-                </if>
-                <if test="item.daFrequency != null">
                     da_frequency = #{item.daFrequency},
-                </if>
-                <if test="item.daDealType != null">
                     da_deal_type = #{item.daDealType},
-                </if>
-                <if test="item.daStartDate != null">
                     da_start_date = #{item.daStartDate},
-                </if>
-                <if test="item.daItemName != null">
                     da_item_name = #{item.daItemName},
-                </if>
-                <if test="item.daStatus != null">
                     da_status = #{item.daStatus},
-                </if>
-                <if test="item.daStopDate != null">
                     da_stop_date = #{item.daStopDate},
-                </if>
-                <if test="item.daGroupNo != null">
                     da_group_no = #{item.daGroupNo},
-                </if>
-                <if test="item.daPrescriptionType != null">
                     da_prescription_type = #{item.daPrescriptionType},
-                </if>
-                <if test="item.daMedType != null">
                     da_med_type = #{item.daMedType},
-                </if>
-                <if test="item.doctorNotice != null">
                     doctor_notice = #{item.doctorNotice},
-                </if>
-                <if test="item.doctorId != null">
                     doctor_id = #{item.doctorId},
-                </if>
-                <if test="item.doctorName != null">
                     doctor_name = #{item.doctorName},
-                </if>
-                <if test="item.medicineType != null">
                     medicine_type = #{item.medicineType},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/HomeDiagnoseInfoMapper.xml

@@ -25,27 +25,13 @@
         <foreach collection="list" item="item"  separator=";">
             update med_home_diagnose_info
             <set>
-                <if test="item.diagnoseType != null">
                     diagnose_type = #{item.diagnoseType},
-                </if>
-                <if test="item.diagnoseTypeShort != null">
                     diagnose_type_short = #{item.diagnoseTypeShort},
-                </if>
-                <if test="item.diagnoseName != null">
                     diagnose_name = #{item.diagnoseName},
-                </if>
-                <if test="item.behospitalType != null">
                     behospital_type = #{item.behospitalType},
-                </if>
-                <if test="item.leaveHospitalType != null">
                     leave_hospital_type = #{item.leaveHospitalType},
-                </if>
-                <if test="item.pathologyDiagnose != null">
                     pathology_diagnose = #{item.pathologyDiagnose},
-                </if>
-                <if test="item.icdCode != null">
                     icd_code = #{item.icdCode},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/HomeOperationInfoMapper.xml

@@ -29,39 +29,17 @@
         <foreach collection="list" item="item"  separator=";">
             update med_home_operation_info
             <set>
-                <if test="item.operationDate != null">
                     operation_date = #{item.operationDate},
-                </if>
-                <if test="item.operationCode != null">
                     operation_code = #{item.operationCode},
-                </if>
-                <if test="item.operationDoctorId != null">
                     operation_doctor_id = #{item.operationDoctorId},
-                </if>
-                <if test="item.firstAssistantId != null">
                     first_assistant_id = #{item.firstAssistantId},
-                </if>
-                <if test="item.secondAssistantId != null">
                     second_assistant_id = #{item.secondAssistantId},
-                </if>
-                <if test="item.cutLevel != null">
                     cut_level = #{item.cutLevel},
-                </if>
-                <if test="item.healingLevel != null">
                     healing_level = #{item.healingLevel},
-                </if>
-                <if test="item.operationName != null">
                     operation_name = #{item.operationName},
-                </if>
-                <if test="item.operationLevel != null">
                     operation_level = #{item.operationLevel},
-                </if>
-                <if test="item.anaesthesiaName != null">
                     anaesthesia_name = #{item.anaesthesiaName},
-                </if>
-                <if test="item.shamOperationName != null">
                     sham_operation_name = #{item.shamOperationName},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/HomePageMapper.xml

@@ -456,376 +456,129 @@
         <foreach collection="list" item="item"  separator=";">
             update med_home_page
             <set>
-                <if test="item.hospitalCode != null">
                     hospital_code = #{item.hospitalCode},
-                </if>
-                <if test="item.hospitalName != null">
                     hospital_name = #{item.hospitalName},
-                </if>
-                <if test="item.orgCode != null">
                     org_code = #{item.orgCode},
-                </if>
-                <if test="item.payType != null">
                     pay_type = #{item.payType},
-                </if>
-                <if test="item.healthCard != null">
                     health_card = #{item.healthCard},
-                </if>
-                <if test="item.behospitalNum != null">
                     behospital_num = #{item.behospitalNum},
-                </if>
-                <if test="item.fileCode != null">
                     file_code = #{item.fileCode},
-                </if>
-                <if test="item.name != null">
                     name = #{item.name},
-                </if>
-                <if test="item.sex != null">
                     sex = #{item.sex},
-                </if>
-                <if test="item.birthday != null">
                     birthday = #{item.birthday},
-                </if>
-                <if test="item.age != null">
                     age = #{item.age},
-                </if>
-                <if test="item.ageUnit != null">
                     age_unit = #{item.ageUnit},
-                </if>
-                <if test="item.nationality != null">
                     nationality = #{item.nationality},
-                </if>
-                <if test="item.newbornMonth != null">
                     newborn_month = #{item.newbornMonth},
-                </if>
-                <if test="item.newbornDay != null">
                     newborn_day = #{item.newbornDay},
-                </if>
-                <if test="item.newbornWeight != null">
                     newborn_weight = #{item.newbornWeight},
-                </if>
-                <if test="item.newbornBehospitalWeight != null">
                     newborn_behospital_weight = #{item.newbornBehospitalWeight},
-                </if>
-                <if test="item.bornAddress != null">
                     born_address = #{item.bornAddress},
-                </if>
-                <if test="item.bornPlace != null">
                     born_place = #{item.bornPlace},
-                </if>
-                <if test="item.nation != null">
                     nation = #{item.nation},
-                </if>
-                <if test="item.identityCardNo != null">
                     identity_card_no = #{item.identityCardNo},
-                </if>
-                <if test="item.jobType != null">
                     job_type = #{item.jobType},
-                </if>
-                <if test="item.marriage != null">
                     marriage = #{item.marriage},
-                </if>
-                <if test="item.curAddress != null">
                     cur_address = #{item.curAddress},
-                </if>
-                <if test="item.curPhone != null">
                     cur_phone = #{item.curPhone},
-                </if>
-                <if test="item.curPostCode != null">
                     cur_post_code = #{item.curPostCode},
-                </if>
-                <if test="item.residenceAddress != null">
                     residence_address = #{item.residenceAddress},
-                </if>
-                <if test="item.residencePostCode != null">
                     residence_post_code = #{item.residencePostCode},
-                </if>
-                <if test="item.workAddress != null">
                     work_address = #{item.workAddress},
-                </if>
-                <if test="item.workPhone != null">
                     work_phone = #{item.workPhone},
-                </if>
-                <if test="item.workPostCode != null">
                     work_post_code = #{item.workPostCode},
-                </if>
-                <if test="item.contactName != null">
                     contact_name = #{item.contactName},
-                </if>
-                <if test="item.contactRelation != null">
                     contact_relation = #{item.contactRelation},
-                </if>
-                <if test="item.contactAddress != null">
                     contact_address = #{item.contactAddress},
-                </if>
-                <if test="item.contactPhone != null">
                     contact_phone = #{item.contactPhone},
-                </if>
-                <if test="item.behospitalWay != null">
                     behospital_way = #{item.behospitalWay},
-                </if>
-                <if test="item.behospitalDate != null">
                     behospital_date = #{item.behospitalDate},
-                </if>
-                <if test="item.behospitalDept != null">
                     behospital_dept = #{item.behospitalDept},
-                </if>
-                <if test="item.behospitalWard != null">
                     behospital_ward = #{item.behospitalWard},
-                </if>
-                <if test="item.behospitalBedId != null">
                     behospital_bed_id = #{item.behospitalBedId},
-                </if>
-                <if test="item.behospitalBedCode != null">
                     behospital_bed_code = #{item.behospitalBedCode},
-                </if>
-                <if test="item.changeDept != null">
                     change_dept = #{item.changeDept},
-                </if>
-                <if test="item.leaveHospitalDate != null">
                     leave_hospital_date = #{item.leaveHospitalDate},
-                </if>
-                <if test="item.leaveHospitalDept != null">
                     leave_hospital_dept = #{item.leaveHospitalDept},
-                </if>
-                <if test="item.leaveHospitalWard != null">
                     leave_hospital_ward = #{item.leaveHospitalWard},
-                </if>
-                <if test="item.leaveHospitalBedId != null">
                     leave_hospital_bed_id = #{item.leaveHospitalBedId},
-                </if>
-                <if test="item.leaveHospitalBedCode != null">
                     leave_hospital_bed_code = #{item.leaveHospitalBedCode},
-                </if>
-                <if test="item.behospitalDayNum != null">
                     behospital_day_num = #{item.behospitalDayNum},
-                </if>
-                <if test="item.outpatientEmrDiagnose != null">
                     outpatient_emr_diagnose = #{item.outpatientEmrDiagnose},
-                </if>
-                <if test="item.outpatientEmrDiagnoseCode != null">
                     outpatient_emr_diagnose_code = #{item.outpatientEmrDiagnoseCode},
-                </if>
-                <if test="item.poisonFactor != null">
                     poison_factor = #{item.poisonFactor},
-                </if>
-                <if test="item.poisonFactorCode != null">
                     poison_factor_code = #{item.poisonFactorCode},
-                </if>
-                <if test="item.pathologyDiagnose != null">
                     pathology_diagnose = #{item.pathologyDiagnose},
-                </if>
-                <if test="item.pathologyDiagnoseCode != null">
                     pathology_diagnose_code = #{item.pathologyDiagnoseCode},
-                </if>
-                <if test="item.pathologyDiagnoseId != null">
                     pathology_diagnose_id = #{item.pathologyDiagnoseId},
-                </if>
-                <if test="item.isMedAllergy != null">
                     is_med_allergy = #{item.isMedAllergy},
-                </if>
-                <if test="item.medAllergyName != null">
                     med_allergy_name = #{item.medAllergyName},
-                </if>
-                <if test="item.autopsy != null">
                     autopsy = #{item.autopsy},
-                </if>
-                <if test="item.bloodType != null">
                     blood_type = #{item.bloodType},
-                </if>
-                <if test="item.rh != null">
                     rh = #{item.rh},
-                </if>
-                <if test="item.deptDirector != null">
                     dept_director = #{item.deptDirector},
-                </if>
-                <if test="item.directorDoctor != null">
                     director_doctor = #{item.directorDoctor},
-                </if>
-                <if test="item.attendingDoctor != null">
                     attending_doctor = #{item.attendingDoctor},
-                </if>
-                <if test="item.behospitalDoctor != null">
                     behospital_doctor = #{item.behospitalDoctor},
-                </if>
-                <if test="item.responseNurse != null">
                     response_nurse = #{item.responseNurse},
-                </if>
-                <if test="item.studyDoctor != null">
                     study_doctor = #{item.studyDoctor},
-                </if>
-                <if test="item.practiceDoctor != null">
                     practice_doctor = #{item.practiceDoctor},
-                </if>
-                <if test="item.encodeMan != null">
                     encode_man = #{item.encodeMan},
-                </if>
-                <if test="item.homePageQuality != null">
                     home_page_quality = #{item.homePageQuality},
-                </if>
-                <if test="item.qcDoctor != null">
                     qc_doctor = #{item.qcDoctor},
-                </if>
-                <if test="item.qcNurse != null">
                     qc_nurse = #{item.qcNurse},
-                </if>
-                <if test="item.qcDate != null">
                     qc_date = #{item.qcDate},
-                </if>
-                <if test="item.leaveHospitalType != null">
                     leave_hospital_type = #{item.leaveHospitalType},
-                </if>
-                <if test="item.acceptOrgCode != null">
                     accept_org_code = #{item.acceptOrgCode},
-                </if>
-                <if test="item.againBehospitalPlan != null">
                     again_behospital_plan = #{item.againBehospitalPlan},
-                </if>
-                <if test="item.againBehospitalGoal != null">
                     again_behospital_goal = #{item.againBehospitalGoal},
-                </if>
-                <if test="item.tbiBeforeDay != null">
                     tbi_before_day = #{item.tbiBeforeDay},
-                </if>
-                <if test="item.tbiBeforeHour != null">
                     tbi_before_hour = #{item.tbiBeforeHour},
-                </if>
-                <if test="item.tbiBeforeMinute != null">
                     tbi_before_minute = #{item.tbiBeforeMinute},
-                </if>
-                <if test="item.tbiAfterDay != null">
                     tbi_after_day = #{item.tbiAfterDay},
-                </if>
-                <if test="item.tbiAfterHour != null">
                     tbi_after_hour = #{item.tbiAfterHour},
-                </if>
-                <if test="item.tbiAfterMinute != null">
                     tbi_after_minute = #{item.tbiAfterMinute},
-                </if>
-                <if test="item.totalFee != null">
                     total_fee = #{item.totalFee},
-                </if>
-                <if test="item.ownFee != null">
                     own_fee = #{item.ownFee},
-                </if>
-                <if test="item.generalFee != null">
                     general_fee = #{item.generalFee},
-                </if>
-                <if test="item.serviceFee != null">
                     service_fee = #{item.serviceFee},
-                </if>
-                <if test="item.nurseFee != null">
                     nurse_fee = #{item.nurseFee},
-                </if>
-                <if test="item.otherFee != null">
                     other_fee = #{item.otherFee},
-                </if>
-                <if test="item.pathologyFee != null">
                     pathology_fee = #{item.pathologyFee},
-                </if>
-                <if test="item.labFee != null">
                     lab_fee = #{item.labFee},
-                </if>
-                <if test="item.pacsFee != null">
                     pacs_fee = #{item.pacsFee},
-                </if>
-                <if test="item.clinicDiagnoseFee != null">
                     clinic_diagnose_fee = #{item.clinicDiagnoseFee},
-                </if>
-                <if test="item.notOperationFee != null">
                     not_operation_fee = #{item.notOperationFee},
-                </if>
-                <if test="item.clinicPhysicFee != null">
                     clinic_physic_fee = #{item.clinicPhysicFee},
-                </if>
-                <if test="item.operationTreatFee != null">
                     operation_treat_fee = #{item.operationTreatFee},
-                </if>
-                <if test="item.anaesthesiaFee != null">
                     anaesthesia_fee = #{item.anaesthesiaFee},
-                </if>
-                <if test="item.operationFee != null">
                     operation_fee = #{item.operationFee},
-                </if>
-                <if test="item.healthTypeFee != null">
                     health_type_fee = #{item.healthTypeFee},
-                </if>
-                <if test="item.chnTreatFee != null">
                     chn_treat_fee = #{item.chnTreatFee},
-                </if>
-                <if test="item.westernMedFee != null">
                     western_med_fee = #{item.westernMedFee},
-                </if>
-                <if test="item.antibiosisFee != null">
                     antibiosis_fee = #{item.antibiosisFee},
-                </if>
-                <if test="item.chnMedFee != null">
                     chn_med_fee = #{item.chnMedFee},
-                </if>
-                <if test="item.chnHerbFee != null">
                     chn_herb_fee = #{item.chnHerbFee},
-                </if>
-                <if test="item.bloodFee != null">
                     blood_fee = #{item.bloodFee},
-                </if>
-                <if test="item.albumenFee != null">
                     albumen_fee = #{item.albumenFee},
-                </if>
-                <if test="item.globulinFee != null">
                     globulin_fee = #{item.globulinFee},
-                </if>
-                <if test="item.bloodFactorFee != null">
                     blood_factor_fee = #{item.bloodFactorFee},
-                </if>
-                <if test="item.cellFactorFee != null">
                     cell_factor_fee = #{item.cellFactorFee},
-                </if>
-                <if test="item.checkMaterialFee != null">
                     check_material_fee = #{item.checkMaterialFee},
-                </if>
-                <if test="item.treatMaterialFee != null">
                     treat_material_fee = #{item.treatMaterialFee},
-                </if>
-                <if test="item.operationMaterialFee != null">
                     operation_material_fee = #{item.operationMaterialFee},
-                </if>
-                <if test="item.otherTypeFee != null">
                     other_type_fee = #{item.otherTypeFee},
-                </if>
-                <if test="item.singleDiagManage != null">
                     single_diag_manage = #{item.singleDiagManage},
-                </if>
-                <if test="item.clinicPathwayManage != null">
                     clinic_pathway_manage = #{item.clinicPathwayManage},
-                </if>
-                <if test="item.isOutpatientBehospital != null">
                     is_outpatient_behospital = #{item.isOutpatientBehospital},
-                </if>
-                <if test="item.isLeaveBehospital != null">
                     is_leave_behospital = #{item.isLeaveBehospital},
-                </if>
-                <if test="item.isOperationBeforeAfter != null">
                     is_operation_before_after = #{item.isOperationBeforeAfter},
-                </if>
-                <if test="item.isClinicPathology != null">
                     is_clinic_pathology = #{item.isClinicPathology},
-                </if>
-                <if test="item.isRadiatePathology != null">
                     is_radiate_pathology = #{item.isRadiatePathology},
-                </if>
-                <if test="item.rescueNum != null">
                     rescue_num = #{item.rescueNum},
-                </if>
-                <if test="item.rescueSuccessNum != null">
                     rescue_success_num = #{item.rescueSuccessNum},
-                </if>
-                <if test="item.isAutoLeavehospital != null">
                     is_auto_leavehospital = #{item.isAutoLeavehospital},
-                </if>
-                <if test="item.returnToType != null">
                     return_to_type = #{item.returnToType},
-                </if>
-
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/MedAbnormalInfoMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.MedAbnormalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedAbnormalInfo">
+        <id column="abnormal_id" property="abnormalId" />
+        <result column="module_name" property="moduleName" />
+        <result column="param_in" property="paramIn" />
+        <result column="param_out" property="paramOut" />
+        <result column="ramark" property="ramark" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+    </resultMap>
+
+</mapper>

src/main/resources/mapper/MedCrisisInfoMapper.xml

@@ -32,45 +32,19 @@
         <foreach collection="list" item="item"  separator=";">
             update med_crisis_info
             <set>
-                <if test="item.crisisId != null">
                     crisis_id = #{item.crisisId},
-                </if>
-                <if test="item.crisisName != null">
                     crisis_name = #{item.crisisName},
-                </if>
-                <if test="item.deptId != null">
                     dept_id = #{item.deptId},
-                </if>
-                <if test="item.deptName != null">
                     dept_name = #{item.deptName},
-                </if>
-                <if test="item.doctorId != null">
                     doctor_id = #{item.doctorId},
-                </if>
-                <if test="item.doctorName != null">
                     doctor_name = #{item.doctorName},
-                </if>
-                <if test="item.crisisValue != null">
                     crisis_value = #{item.crisisValue},
-                </if>
-                <if test="item.crisisDesc != null">
                     crisis_desc = #{item.crisisDesc},
-                </if>
-                <if test="item.crisisStatus != null">
                     crisis_status = #{item.crisisStatus},
-                </if>
-                <if test="item.crisisTopValue != null">
                     crisis_top_value = #{item.crisisTopValue},
-                </if>
-                <if test="item.crisisLowerValue != null">
                     crisis_lower_value = #{item.crisisLowerValue},
-                </if>
-                <if test="item.sendDate != null">
                     send_date = #{item.sendDate},
-                </if>
-                <if test="item.repDate != null">
                     rep_date = #{item.repDate},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/MedicalRecordContentMapper.xml

@@ -8,6 +8,8 @@
         <result column="hospital_id" property="hospitalId" />
         <result column="content_blob" property="contentBlob" typeHandler="org.apache.ibatis.type.BlobTypeHandler"/>
         <result column="content_text" property="contentText" />
+        <result column="html_text" property="htmlText" />
+        <result column="xml_text" property="xmlText" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />
         <result column="gmt_modified" property="gmtModified" />
@@ -19,12 +21,8 @@
         <foreach collection="list" item="item"  separator=";">
             update med_medical_record_content
             <set>
-                <if test="item.htmlText != null">
                     html_text = #{item.htmlText},
-                </if>
-                <if test="item.xmlText != null">
                     xml_text = #{item.xmlText},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/MedicalRecordMapper.xml

@@ -37,18 +37,10 @@
         <foreach collection="list" item="item"  separator=";">
             update med_medical_record
             <set>
-                <if test="item.orgCode != null">
                     org_code = #{item.orgCode},
-                </if>
-                <if test="item.recTypeId != null">
                     rec_type_id = #{item.recTypeId},
-                </if>
-                <if test="item.recDate != null">
                     rec_date = #{item.recDate},
-                </if>
-                <if test="item.recTitle != null">
                     rec_title = #{item.recTitle},
-                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

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

@@ -1,4 +1,4 @@
-package com.diagbot.facade;
+package mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.QcModelHospital;

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -19,7 +19,7 @@
     </resultMap>
 
     <!-- 病历数统计 -->
-    <select id="getQcresultSelectively"  parameterType="com.diagbot.vo.QcresultFilterVO" resultType="int">
+    <select id="getQcresultSelectively" parameterType="com.diagbot.vo.QcresultFilterVO" resultType="int">
         SELECT
         count(1)
         FROM

src/test/java/com/diagbot/CodeGeneration.java

@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.3.5:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "med_doctor_advice"}); // 需要生成的表
+        strategy.setInclude(new String[] { "med_abnormal_info"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);