Merge branch 'his/common' into his/tzmh

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

@@ -146,6 +146,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
                 .antMatchers("/qc/data/deleteFlag").permitAll()
+                .antMatchers("/qc/data/sendPacsResults").permitAll()
+                .antMatchers("/qc/data/sendLisResults").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -174,6 +174,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendHomeOperation", request)
                 || matchers("/qc/data/sendCrisis", request)
                 || matchers("/qc/data/deleteFlag", request)
+                || matchers("/qc/data/sendLisResults", request)
+                || matchers("/qc/data/sendPacsResults", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -0,0 +1,232 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-30
+ */
+public class MedLisResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告单号
+     */
+    private String reptNo;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告代码
+     */
+    private String itemCode;
+
+    /**
+     * 报告名称
+     */
+    private String itemName;
+
+    /**
+     * 检验结果
+     */
+    private String result;
+
+    /**
+     * 最小参考值
+     */
+    private String referenceMin;
+
+    /**
+     * 最大参考值
+     */
+    private String referenceMax;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 异常标志
+     */
+    private String abnormal;
+
+    /**
+     * 异常颜色
+     */
+    private String color;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getReptNo() {
+        return reptNo;
+    }
+
+    public void setReptNo(String reptNo) {
+        this.reptNo = reptNo;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+    public String getReferenceMin() {
+        return referenceMin;
+    }
+
+    public void setReferenceMin(String referenceMin) {
+        this.referenceMin = referenceMin;
+    }
+    public String getReferenceMax() {
+        return referenceMax;
+    }
+
+    public void setReferenceMax(String referenceMax) {
+        this.referenceMax = referenceMax;
+    }
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+    public String getAbnormal() {
+        return abnormal;
+    }
+
+    public void setAbnormal(String abnormal) {
+        this.abnormal = abnormal;
+    }
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+    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 "MedLisResult{" +
+            "reptNo=" + reptNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", itemCode=" + itemCode +
+            ", itemName=" + itemName +
+            ", result=" + result +
+            ", referenceMin=" + referenceMin +
+            ", referenceMax=" + referenceMax +
+            ", unit=" + unit +
+            ", abnormal=" + abnormal +
+            ", color=" + color +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -0,0 +1,258 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-30
+ */
+public class MedPacsResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告单号
+     */
+    private String reptNo;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告名称
+     */
+    private String reptName;
+
+    /**
+     * 检查部位
+     */
+    private String part;
+
+    /**
+     * 检查所见
+     */
+    private String clinicSight;
+
+    /**
+     * 检查结果诊断
+     */
+    private String reptDiag;
+
+    /**
+     * 观察记录
+     */
+    private String remark;
+
+    /**
+     * 临床诊断
+     */
+    private String clinicDiag;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 审核医生
+     */
+    private String checkerDoctor;
+
+    /**
+     * 报告医生
+     */
+    private String reportDoctor;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getReptNo() {
+        return reptNo;
+    }
+
+    public void setReptNo(String reptNo) {
+        this.reptNo = reptNo;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getReptName() {
+        return reptName;
+    }
+
+    public void setReptName(String reptName) {
+        this.reptName = reptName;
+    }
+    public String getPart() {
+        return part;
+    }
+
+    public void setPart(String part) {
+        this.part = part;
+    }
+    public String getClinicSight() {
+        return clinicSight;
+    }
+
+    public void setClinicSight(String clinicSight) {
+        this.clinicSight = clinicSight;
+    }
+    public String getReptDiag() {
+        return reptDiag;
+    }
+
+    public void setReptDiag(String reptDiag) {
+        this.reptDiag = reptDiag;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getClinicDiag() {
+        return clinicDiag;
+    }
+
+    public void setClinicDiag(String clinicDiag) {
+        this.clinicDiag = clinicDiag;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public String getCheckerDoctor() {
+        return checkerDoctor;
+    }
+
+    public void setCheckerDoctor(String checkerDoctor) {
+        this.checkerDoctor = checkerDoctor;
+    }
+    public String getReportDoctor() {
+        return reportDoctor;
+    }
+
+    public void setReportDoctor(String reportDoctor) {
+        this.reportDoctor = reportDoctor;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    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 "MedPacsResult{" +
+            "reptNo=" + reptNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", reptName=" + reptName +
+            ", part=" + part +
+            ", clinicSight=" + clinicSight +
+            ", reptDiag=" + reptDiag +
+            ", remark=" + remark +
+            ", clinicDiag=" + clinicDiag +
+            ", applyDoctor=" + applyDoctor +
+            ", checkerDoctor=" + checkerDoctor +
+            ", reportDoctor=" + reportDoctor +
+            ", deptName=" + deptName +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

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

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

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

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

@@ -0,0 +1,22 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.MedLisResult;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-30
+ */
+public interface MedLisResultMapper extends BaseMapper<MedLisResult> {
+    /**
+     * 批量修改lis结果
+     * @param list
+     */
+    public void updateBatchByKey(List<MedLisResult> list);
+}

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

@@ -0,0 +1,22 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.MedPacsResult;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-30
+ */
+public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
+    /**
+     * 批量修改lis结果
+     * @param list
+     */
+    public void updateBatchByKey(List<MedPacsResult> list);
+}

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

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

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

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

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

@@ -0,0 +1,25 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.MedLisResult;
+import com.diagbot.mapper.MedLisResultMapper;
+import com.diagbot.service.MedLisResultService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-30
+ */
+@Service
+public class MedLisResultServiceImpl extends ServiceImpl<MedLisResultMapper, MedLisResult> implements MedLisResultService {
+
+    public void updateBatchByKey(List<MedLisResult> list){
+        this.baseMapper.updateBatchByKey(list);
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.MedPacsResult;
+import com.diagbot.mapper.MedPacsResultMapper;
+import com.diagbot.service.MedPacsResultService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-30
+ */
+@Service
+public class MedPacsResultServiceImpl extends ServiceImpl<MedPacsResultMapper, MedPacsResult> implements MedPacsResultService {
+
+    public void updateBatchByKey(List<MedPacsResult> list){
+        this.baseMapper.updateBatchByKey(list);
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.diagbot.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.SysTaskCron;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.SysTaskCronFacade;
+import com.diagbot.facade.data.AMedLisResultFacade;
+import com.diagbot.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.TriggerContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务
+@Slf4j
+public class MedLisResultTask implements SchedulingConfigurer {
+
+    @Autowired
+    private SysTaskCronFacade sysTaskCronFacade;
+
+    private SysTaskCron task001 = new SysTaskCron();
+
+    @Autowired
+    private AMedLisResultFacade aMedLisResultFacade;
+
+    /**
+     * 执行定时任务.
+     */
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.addTriggerTask(new Runnable() {
+            @Override
+            public void run() {
+                //1.添加任务内容(Runnable)
+                if (null != task001
+                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+                        && task001.getIsUsed().equals(1)) {
+                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+                    aMedLisResultFacade.executeMedLisResult();
+                }
+            }
+        }, new Trigger() {
+            @Override
+            public Date nextExecutionTime(TriggerContext triggerContext) {
+                //2.1 从数据库获取执行周期
+                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+                        .eq("cron_code", "TASK_LIS"), false);
+                String cron = "0 0/1 * * * ?";
+                //2.2 合法性校验.
+                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+                    cron = task001.getCron();
+                }
+                CronTrigger trigger = new CronTrigger(cron);
+                return trigger.nextExecutionTime(triggerContext);
+            }
+        });
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.diagbot.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.SysTaskCron;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.SysTaskCronFacade;
+import com.diagbot.facade.data.AMedPacsResultFacade;
+import com.diagbot.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.TriggerContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务
+@Slf4j
+public class MedPacsResultTask implements SchedulingConfigurer {
+
+    @Autowired
+    private SysTaskCronFacade sysTaskCronFacade;
+
+    private SysTaskCron task001 = new SysTaskCron();
+
+    @Autowired
+    private AMedPacsResultFacade aMedPacsResultFacade;
+
+    /**
+     * 执行定时任务.
+     */
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.addTriggerTask(new Runnable() {
+            @Override
+            public void run() {
+                //1.添加任务内容(Runnable)
+                if (null != task001
+                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+                        && task001.getIsUsed().equals(1)) {
+                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+                    aMedPacsResultFacade.executeMedPacsResult();
+                }
+            }
+        }, new Trigger() {
+            @Override
+            public Date nextExecutionTime(TriggerContext triggerContext) {
+                //2.1 从数据库获取执行周期
+                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+                        .eq("cron_code", "TASK_PACS"), false);
+                String cron = "0 0/1 * * * ?";
+                //2.2 合法性校验.
+                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+                    cron = task001.getCron();
+                }
+                CronTrigger trigger = new CronTrigger(cron);
+                return trigger.nextExecutionTime(triggerContext);
+            }
+        });
+    }
+}

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

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

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

@@ -27,4 +27,6 @@ public class ADeleteFlagVO {
 
     private String recId;
 
+    private String reptNo;
+
 }

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

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

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

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

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

@@ -4,17 +4,14 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.*;
 import com.diagbot.facade.data.*;
 import com.diagbot.vo.data.*;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-
-import io.swagger.annotations.Api;
-
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +54,12 @@ public class DataController {
     @Autowired
     private AMedicalRecordContentFacade aMedicalRecordContentFacade;
 
+    @Autowired
+    private AMedLisResultFacade aMedLisResultFacade;
+
+    @Autowired
+    private AMedPacsResultFacade aMedPacsResultFacade;
+
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
@@ -141,13 +144,27 @@ public class DataController {
         return RespDTO.onSuc(aHomeOperationInfoFacade.executeHomeOperation(list));
     }
 
-    @ApiOperation(value = "数据引擎-获取危急值")
+    @ApiOperation(value = "危急值")
     @PostMapping("/sendCrisis")
     @SysLogger("sendCrisis")
     public RespDTO<List<AMedCrisisDTO>> sendCrisis(@RequestBody List<AMedCrisisVO> list){
         return aMedCrisisFacade.executeMedCrisis(list);
     }
 
+    @ApiOperation(value = "检查")
+    @PostMapping("/sendPacsResults")
+    @SysLogger("sendPacsResults")
+    public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list){
+        return aMedPacsResultFacade.executeMedPacsResult(list);
+    }
+
+    @ApiOperation(value = "化验")
+    @PostMapping("/sendLisResults")
+    @SysLogger("sendLisResults")
+    public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list){
+        return aMedLisResultFacade.executeMedLisResult(list);
+    }
+
     @ApiOperation(value = "数据引擎-删除标识")
     @PostMapping("/deleteFlag")
     @SysLogger("deleteFlag")
@@ -173,6 +190,12 @@ public class DataController {
         }else if("wsnr".equals(aDeleteFlagVO.getModeType())){
             //文书内容
             aMedicalRecordContentFacade.deleteFlag(aDeleteFlagVO);
+        }else if("hyjg".equals(aDeleteFlagVO.getModeType())){
+            //文书内容
+            aMedLisResultFacade.deleteFlag(aDeleteFlagVO);
+        }else if("jcjg".equals(aDeleteFlagVO.getModeType())){
+            //文书内容
+            aMedPacsResultFacade.deleteFlag(aDeleteFlagVO);
         }
         return RespDTO.onSuc(true);
     }

src/main/resources/mapper/MedLisResultMapper.xml

@@ -0,0 +1,49 @@
+<?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.MedLisResultMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedLisResult">
+        <id column="rept_no" property="reptNo" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="item_code" property="itemCode" />
+        <result column="item_name" property="itemName" />
+        <result column="result" property="result" />
+        <result column="reference_min" property="referenceMin" />
+        <result column="reference_max" property="referenceMax" />
+        <result column="unit" property="unit" />
+        <result column="abnormal" property="abnormal" />
+        <result column="color" property="color" />
+        <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>
+
+    <update id="updateBatchByKey">
+        <foreach collection="list" item="item"  separator=";">
+            update med_lis_result
+            <set>
+                behospital_code = #{item.behospitalCode},
+                item_code = #{item.itemCode},
+                item_name = #{item.itemName},
+                result = #{item.result},
+                reference_min = #{item.referenceMin},
+                reference_max = #{item.referenceMax},
+                unit = #{item.unit},
+                abnormal = #{item.abnormal},
+                color = #{item.color},
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
+            </set>
+            where rept_no = #{item.reptNo} and hospital_id = #{item.hospitalId}
+        </foreach>
+    </update>
+
+</mapper>

src/main/resources/mapper/MedPacsResultMapper.xml

@@ -0,0 +1,53 @@
+<?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.MedPacsResultMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedPacsResult">
+        <id column="rept_no" property="reptNo" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="rept_name" property="reptName" />
+        <result column="part" property="part" />
+        <result column="clinic_sight" property="clinicSight" />
+        <result column="rept_diag" property="reptDiag" />
+        <result column="remark" property="remark" />
+        <result column="clinic_diag" property="clinicDiag" />
+        <result column="apply_doctor" property="applyDoctor" />
+        <result column="checker_doctor" property="checkerDoctor" />
+        <result column="report_doctor" property="reportDoctor" />
+        <result column="dept_name" property="deptName" />
+        <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>
+
+    <update id="updateBatchByKey">
+        <foreach collection="list" item="item"  separator=";">
+            update med_pacs_result
+            <set>
+                behospital_code = #{item.behospitalCode},
+                rept_name = #{item.reptName},
+                part = #{item.part},
+                clinic_sight = #{item.clinicSight},
+                rept_diag = #{item.reptDiag},
+                remark = #{item.remark},
+                clinic_diag = #{item.clinicDiag},
+                apply_doctor = #{item.applyDoctor},
+                checker_doctor = #{item.checkerDoctor},
+                report_doctor = #{item.reportDoctor},
+                dept_name = #{item.deptName},
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
+            </set>
+            where rept_no = #{item.reptNo} and hospital_id = #{item.hospitalId}
+        </foreach>
+    </update>
+
+</mapper>

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

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "med_abnormal_info"}); // 需要生成的表
+        strategy.setInclude(new String[] { "med_pacs_result","med_lis_result"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);