时间类型修改导致qc规则没有没有触发

src/main/java/com/diagbot/dto/MedLisResultDTO.java

@@ -45,6 +45,11 @@ public class MedLisResultDTO implements Serializable {
      */
     private String repName;
 
+    /**
+     * 报告名称
+     */
+    private String itemName;
+
     /**
      * 检验结果
      */
@@ -105,155 +110,185 @@ public class MedLisResultDTO implements Serializable {
      */
     private String modifier;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    public MedLisResultDTO(String repNo, Integer hospitalId, String behospitalCode, String itemCode, String reportName, String repName, String itemName, String result, String reference, String referenceMin, String referenceMax, String unit, String abnormal, String color, String isDeleted, LocalDateTime gmtCreate, LocalDateTime gmtModified, String creator, String modifier) {
+        this.repNo = repNo;
+        this.hospitalId = hospitalId;
+        this.behospitalCode = behospitalCode;
+        this.itemCode = itemCode;
+        this.reportName = reportName;
+        this.repName = repName;
+        this.itemName = itemName;
+        this.result = result;
+        this.reference = reference;
+        this.referenceMin = referenceMin;
+        this.referenceMax = referenceMax;
+        this.unit = unit;
+        this.abnormal = abnormal;
+        this.color = color;
+        this.isDeleted = isDeleted;
+        this.gmtCreate = gmtCreate;
+        this.gmtModified = gmtModified;
+        this.creator = creator;
+        this.modifier = modifier;
     }
 
-    public String getRepNo() {
-        return repNo;
+    public MedLisResultDTO() {
     }
 
     public void setRepNo(String repNo) {
         this.repNo = repNo;
     }
 
-    public Integer getHospitalId() {
-        return hospitalId;
-    }
-
     public void setHospitalId(Integer 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 getModifier() {
-        return modifier;
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    public void setRepName(String repName) {
+        this.repName = repName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
+
+    public void setReferenceMin(String referenceMin) {
+        this.referenceMin = referenceMin;
+    }
+
+    public void setReferenceMax(String referenceMax) {
+        this.referenceMax = referenceMax;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public void setAbnormal(String abnormal) {
+        this.abnormal = abnormal;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
     }
 
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
 
-    public String getReportName() {
-        return reportName;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
-    public void setReportName(String reportName) {
-        this.reportName = reportName;
+    public String getRepNo() {
+        return repNo;
+    }
+
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public String getReportName() {
+        return reportName;
     }
 
     public String getRepName() {
         return repName;
     }
 
-    public void setRepName(String repName) {
-        this.repName = repName;
+    public String getItemName() {
+        return itemName;
     }
 
     public String getResult() {
         return result;
     }
 
-    public void setResult(String result) {
-        this.result = result;
-    }
-
     public String getReference() {
         return reference;
     }
 
-    public void setReference(String reference) {
-        this.reference = reference;
-    }
-
     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 LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
     public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
     public String getCreator() {
         return creator;
     }
 
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public MedLisResultDTO() {
+    public String getModifier() {
+        return modifier;
     }
 
     @Override
@@ -265,6 +300,7 @@ public class MedLisResultDTO implements Serializable {
                 ", itemCode='" + itemCode + '\'' +
                 ", reportName='" + reportName + '\'' +
                 ", repName='" + repName + '\'' +
+                ", itemName='" + itemName + '\'' +
                 ", result='" + result + '\'' +
                 ", reference='" + reference + '\'' +
                 ", referenceMin='" + referenceMin + '\'' +

src/main/java/com/diagbot/dto/MedPacsResultDTO.java

@@ -0,0 +1,111 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-04
+ */
+@Data
+public class MedPacsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院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 LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+}

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

@@ -1,13 +1,9 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.diagbot.client.AuthServiceClient;
 import com.diagbot.dto.*;
 import com.diagbot.entity.*;
@@ -44,7 +40,6 @@ import com.google.common.collect.Maps;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cglib.beans.BeanMap;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
@@ -594,9 +589,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         // 化验
         //使用sql进行关联优化数据查询
         List<MedLisResultDTO> medLisResultListDTO = medLisResultFacade.getMedLisResultList(behospitalInfoList.get(0));
-        List<MedLisResult> medLisResultList = new ArrayList<>();
+        List<MedLisResultDTO> medLisResultList = new ArrayList<>();
         for (MedLisResultDTO medLisResultSingle : medLisResultListDTO) {
-            MedLisResult medLisResult = new MedLisResult();
+            MedLisResultDTO medLisResult = new MedLisResultDTO();
             BeanUtil.copyProperties(medLisResultSingle, medLisResult);
             medLisResult.setItemName(medLisResultSingle.getRepName() + "=" + medLisResultSingle.getReportName());
             medLisResultList.add(medLisResult);
@@ -604,7 +599,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         // 辅检
         //使用sql进行关联优化数据查询
-        List<MedPacsResult> medPacsResultList = medPacsResultFacade.getMedPacsResultList(behospitalInfoList.get(0));
+        List<MedPacsResultDTO> medPacsResultList = medPacsResultFacade.getMedPacsResultList(behospitalInfoList.get(0));
 
 
         /**

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

@@ -1,8 +1,7 @@
 package com.diagbot.facade;
 
-import com.diagbot.dto.MedLisResultDTO;
+import com.diagbot.dto.MedPacsResultDTO;
 import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.MedPacsResult;
 import com.diagbot.service.impl.MedPacsResultServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -15,7 +14,7 @@ import java.util.List;
  */
 @Component
 public class MedPacsResultFacade extends MedPacsResultServiceImpl {
-    public List<MedPacsResult> getMedPacsResultList(BehospitalInfo behospitalInfo){
+    public List<MedPacsResultDTO> getMedPacsResultList(BehospitalInfo behospitalInfo){
         return getMedPacsResults(behospitalInfo);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.mapper;
 
+import com.diagbot.dto.MedPacsResultDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.MedPacsResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,7 +16,7 @@ import java.util.List;
  * @since 2020-08-04
  */
 public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
-    public List<MedPacsResult> getMedPacsResults(BehospitalInfo behospitalInfo);
+    public List<MedPacsResultDTO> getMedPacsResults(BehospitalInfo behospitalInfo);
 
     void updateBatchByKey(List<MedPacsResult> list);
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.diagbot.dto.MedPacsResultDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.MedPacsResult;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -15,6 +16,6 @@ import java.util.List;
  * @since 2020-08-04
  */
 public interface MedPacsResultService extends IService<MedPacsResult> {
-    public List<MedPacsResult> getMedPacsResults(BehospitalInfo behospitalInfo);
+    public List<MedPacsResultDTO> getMedPacsResults(BehospitalInfo behospitalInfo);
 
 }

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

@@ -1,6 +1,6 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.dto.MedLisResultDTO;
+import com.diagbot.dto.MedPacsResultDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.MedPacsResult;
 import com.diagbot.mapper.MedPacsResultMapper;
@@ -21,7 +21,7 @@ import java.util.List;
 @Service
 public class MedPacsResultServiceImpl extends ServiceImpl<MedPacsResultMapper, MedPacsResult> implements MedPacsResultService {
     @Override
-    public List<MedPacsResult> getMedPacsResults(BehospitalInfo behospitalInfo) {
+    public List<MedPacsResultDTO> getMedPacsResults(BehospitalInfo behospitalInfo) {
         return baseMapper.getMedPacsResults(behospitalInfo);
     }
 }

src/main/resources/mapper/MedPacsResultMapper.xml

@@ -24,7 +24,7 @@
         <result column="modifier" property="modifier"/>
     </resultMap>
     <select id="getMedPacsResults" parameterType="com.diagbot.entity.BehospitalInfo"
-            resultType="com.diagbot.entity.MedPacsResult">
+            resultType="com.diagbot.dto.MedPacsResultDTO">
         SELECT
         t2.rep_no repNo,
         t1.rep_name as reptName,