Merge remote-tracking branch 'origin/develop' into dev/20200731_1.4.0

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

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 public class MedLisResult implements Serializable {
 
@@ -18,7 +18,7 @@ public class MedLisResult implements Serializable {
     /**
      * 报告单号
      */
-    private String reptNo;
+    private String repNo;
 
     /**
      * 医院ID
@@ -100,12 +100,12 @@ public class MedLisResult implements Serializable {
      */
     private String modifier;
 
-    public String getReptNo() {
-        return reptNo;
+    public String getRepNo() {
+        return repNo;
     }
 
-    public void setReptNo(String reptNo) {
-        this.reptNo = reptNo;
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
     }
     public Integer getHospitalId() {
         return hospitalId;
@@ -223,7 +223,7 @@ public class MedLisResult implements Serializable {
     @Override
     public String toString() {
         return "MedLisResult{" +
-            "reptNo=" + reptNo +
+            "repNo=" + repNo +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", itemCode=" + itemCode +

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

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 public class MedPacsResult implements Serializable {
 
@@ -18,7 +18,7 @@ public class MedPacsResult implements Serializable {
     /**
      * 报告单号
      */
-    private String reptNo;
+    private String repNo;
 
     /**
      * 医院ID
@@ -105,12 +105,12 @@ public class MedPacsResult implements Serializable {
      */
     private String modifier;
 
-    public String getReptNo() {
-        return reptNo;
+    public String getRepNo() {
+        return repNo;
     }
 
-    public void setReptNo(String reptNo) {
-        this.reptNo = reptNo;
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
     }
     public Integer getHospitalId() {
         return hospitalId;
@@ -235,7 +235,7 @@ public class MedPacsResult implements Serializable {
     @Override
     public String toString() {
         return "MedPacsResult{" +
-            "reptNo=" + reptNo +
+            "repNo=" + repNo +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", reptName=" + reptName +

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

@@ -438,7 +438,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         QueryWrapper<MedLisInfo> medLisInfoQe = new QueryWrapper<>();
         medLisInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         medLisInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
-        medLisInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
+        medLisInfoQe.like("behospital_code", behospitalInfo.getFileCode());
         medLisInfoQe.isNotNull("rep_name");
         medLisInfoQe.isNotNull("check_date");
         medLisInfoQe.apply("check_date!=''");
@@ -463,12 +463,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             medLisResultList = medLisResultFacade.list(new QueryWrapper<MedLisResult>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("hospital_id", behospitalInfo.getHospitalId())
-                    .eq("behospital_code", behospitalInfo.getFileCode())
+                    .like("behospital_code", behospitalInfo.getFileCode())
                     .isNotNull("item_name")
-                    .in("rept_no", medLisInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
+                    .in("rep_no", medLisInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
             medLisResultList.forEach(medLisResult -> {
-                medLisResult.setItemName(repNoRepNameMap.get(medLisResult.getReptNo()) + "=" + medLisResult.getItemName());
+                medLisResult.setItemName(repNoRepNameMap.get(medLisResult.getRepNo()) + "=" + medLisResult.getItemName());
             });
         }
         return medLisResultList;
@@ -489,7 +489,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         QueryWrapper<MedPacsInfo> medPacsInfoQe = new QueryWrapper<>();
         medPacsInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         medPacsInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
-        medPacsInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
+        medPacsInfoQe.like("behospital_code", behospitalInfo.getFileCode());
         medPacsInfoQe.isNotNull("check_date");
         medPacsInfoQe.apply("check_date!=''");
         medPacsInfoQe.apply(
@@ -511,8 +511,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             medPacsResultList = medPacsResultFacade.list(new QueryWrapper<MedPacsResult>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("hospital_id", behospitalInfo.getHospitalId())
-                    .eq("behospital_code", behospitalInfo.getFileCode())
-                    .in("rept_no", medPacsInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
+                    .like("behospital_code", behospitalInfo.getFileCode())
+                    .in("rep_no", medPacsInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
         }
         return medPacsResultList;

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 public interface MedLisResultMapper extends BaseMapper<MedLisResult> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 public interface MedLisResultService extends IService<MedLisResult> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 public interface MedPacsResultService extends IService<MedPacsResult> {
 

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 @Service
 public class MedLisResultServiceImpl extends ServiceImpl<MedLisResultMapper, MedLisResult> implements MedLisResultService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author zhoutg
- * @since 2020-07-28
+ * @since 2020-08-04
  */
 @Service
 public class MedPacsResultServiceImpl extends ServiceImpl<MedPacsResultMapper, MedPacsResult> implements MedPacsResultService {

src/main/resources/mapper/MedLisResultMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedLisResult">
-        <result column="rept_no" property="reptNo" />
+        <result column="rep_no" property="repNo" />
         <result column="hospital_id" property="hospitalId" />
         <result column="behospital_code" property="behospitalCode" />
         <result column="item_code" property="itemCode" />

src/main/resources/mapper/MedPacsResultMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedPacsResult">
-        <result column="rept_no" property="reptNo" />
+        <result column="rep_no" property="repNo" />
         <result column="hospital_id" property="hospitalId" />
         <result column="behospital_code" property="behospitalCode" />
         <result column="rept_name" property="reptName" />