fix:修复查询视图条件

src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java

@@ -257,6 +257,7 @@ public class MzZyyReportCollectJob {
     @XxlJob("MzZyyXinDianCollectJob")
     public void xinDianCollectJob() {
         log.info(">>>>>>>>>>>>>>>>>>>>>> 梅州中医院心电视图采集任务开始！");
+        try {
             // 1.获取任务和患者信息 2.查询视图信息 3.上报下载
             String jobParam = XxlJobHelper.getJobParam();
             JSONObject jobParamJsonObject = JSONObject.parseObject(jobParam);
@@ -272,14 +273,14 @@ public class MzZyyReportCollectJob {
                     && commonResult.getData() != null) {
                 ReportDownTwoDto downTwoDto = commonResult.getData();
                 ReportTaskTwoDto task = downTwoDto.getTasks().get(0);
-            log.info("获取了任务：{}", Func.toJson(task));
+                log.info("梅州中医院心电视图采集,获取了任务：{}", Func.toJson(task));
 
                 String patientId = downTwoDto.getPatientId();
                 String jzh = downTwoDto.getJzh();
 
                 List<MzZyyXinDianView> xinDianViews = xinDianViewMapper.getPatientXinDianView(jzh, extraCondition);
                 int size = xinDianViews.size();
-            log.info("记账号：{} 采集心电数据：{} 条！", jzh, size);
+                log.info("梅州中医院心电视图采集，记账号：{} 采集心电数据：{} 条！", jzh, size);
                 if (size <= 0) {
                     determineAndCancelTask(patientId, collectorId);
                     return;
@@ -309,6 +310,10 @@ public class MzZyyReportCollectJob {
                     downPlatformService.report(reportDownDto);
                 }
             }
+        } catch (Exception ex) {
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 梅州中医院心电视图采集任务出错了！" + ex.getMessage(), ex);
+        }
+
         log.info(">>>>>>>>>>>>>>>>>>>>>> 梅州中医院心电视图采集任务结束！");
 
     }

src/main/resources/mapper/MzZyyXinDianViewMapper.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.docus.server.sdry.mapper.ShouMaViewMapper">
+<mapper namespace="com.docus.server.mzzyy.mapper.MzZyyXinDianViewMapper">
 
-    <select id="getPatientShouMaView" resultType="com.docus.server.sdry.entity.ShouMaView">
+    <select id="getPatientXinDianView" resultType="com.docus.server.mzzyy.entity.MzZyyXinDianView">
         SELECT
             JZH as jzh,
             BGID as bgid,
             BGMC as bgmc,
             BGDZ as bgdz
         FROM dbo.V_JSWZH_XD
-        WHERE 1=1
+        WHERE 1=1 AND JZH = #{jzh}
         <if test="ext != null and ext != ''">
             ${ext}
         </if>