高州健康平台接口

lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java

@@ -1,9 +1,6 @@
 package com.czlisinterface.gzszyy.mapper;
 
-import com.czlisinterface.gzszyy.pojo.V_LAR_EXAM_INFO;
+import com.czlisinterface.gzszyy.pojo.*;
-import com.czlisinterface.gzszyy.pojo.V_TESTDETAILS;
-import com.czlisinterface.gzszyy.pojo.V_lab_microbe;
-import com.czlisinterface.gzszyy.pojo.V_lab_susceptibility;
 import com.czlisinterface.system.pojo.LabReqmain;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -14,6 +11,7 @@ import java.util.Map;
 
 @Mapper
 public interface LisMapper_gzszyy {
+    List<V_TestRecord> getV_TestRecord(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
     List<V_LAR_EXAM_INFO> getV_LAR_EXAM_INFO(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
     List<V_TESTDETAILS> getV_TESTDETAILS(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
     List<V_lab_susceptibility> getV_lab_susceptibility(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);

lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_TestRecordMapper.java

@@ -0,0 +1,9 @@
+package com.czlisinterface.gzszyy.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.czlisinterface.gzszyy.pojo.V_TestRecord;
+
+@DS("sqlpt")
+public interface V_TestRecordMapper extends BaseMapper<V_TestRecord> {
+}

lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_TestRecord.java

@@ -0,0 +1,42 @@
+package com.czlisinterface.gzszyy.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("TestRecord")
+public class V_TestRecord {
+    private String APP_CODE;
+    private String APPLY_DT;
+    private String PERSONAL_ID;
+    private String OP_EM_HP_EX_MARK;
+    private String OP_EM_HP_EX_NO;
+    private String CARDTYPE;
+    private String CARDNO;
+    private String NAME;
+    private String SEX;
+    private String SEX_NAME;
+    private String BIRTHDAY;
+    private String HOS_PACK_CODE;
+    private String HOS_PACK_NAME;
+    private String RPT_CAT_CODE;
+    private String RPT_CAT_NAME;
+    private String IF_URGENT;
+    private String APP_ORGAN_CODE;
+    private String APP_ORGAN_NAME;
+    private String APP_DPT_CODE;
+    private String APP_DPT_NAME;
+    private String APP_DOC_IDCARD;
+    private String APP_DOC_NAME;
+    private String CARDTYPE_ORI;
+    private String CARDTYPE_NAME_ORI;
+    private String APP_DPT_CODE_ORI;
+    private String APP_DPT_NAME_ORI;
+    private String APP_ORGAN_CODE_ORI;
+    private String APP_ORGAN_NAME_ORI;
+}

lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java

@@ -36,6 +36,8 @@ public class Lisinterface_gzszyy extends CommonImpl {
     V_TESTDETAILSMapper vTESTDETAILSMapper;
     @Resource
     LabUploadreportPtMapper labUploadreportPtMapper;
+    @Resource
+    V_TestRecordMapper vTestRecordMapper;;
 
 
     /**
@@ -49,13 +51,17 @@ public class Lisinterface_gzszyy extends CommonImpl {
             String yq = stringObjectMap.get("yq").toString();
             String ybh = stringObjectMap.get("ybh").toString();
             Date confirmdt = (Date)stringObjectMap.get("confirmdt");
-            List<V_LAR_EXAM_INFO> vLarExamInfoList = lisMapperGzszyy.getV_LAR_EXAM_INFO(jyrq, yq, ybh);
             LabUploadreportPt labUploadreportPt = new LabUploadreportPt();
             labUploadreportPt.setJyrq(jyrq);
             labUploadreportPt.setYq(yq);
             labUploadreportPt.setYbh(ybh);
             labUploadreportPt.setShsj(confirmdt);
             try{
+                List<V_TestRecord> vTestRecordList = lisMapperGzszyy.getV_TestRecord(jyrq,yq,ybh);
+                for (V_TestRecord vTestRecord : vTestRecordList) {
+                    vTestRecordMapper.insert(vTestRecord);
+                }
+                List<V_LAR_EXAM_INFO> vLarExamInfoList = lisMapperGzszyy.getV_LAR_EXAM_INFO(jyrq, yq, ybh);
                 for (V_LAR_EXAM_INFO vLarExamInfo : vLarExamInfoList) {
                     vLAR_EXAM_INFOMapper.insert(vLarExamInfo);
                 }

lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml

@@ -2,6 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlisinterface.gzszyy.mapper.LisMapper_gzszyy">
+
+    <select id="getV_TestRecord" resultType="com.czlisinterface.gzszyy.pojo.V_TestRecord">
+        select * from V_TestRecord where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
+    </select>
+
     <select id="getV_LAR_EXAM_INFO" resultType="com.czlisinterface.gzszyy.pojo.V_LAR_EXAM_INFO">
         select * from V_LAR_EXAM_INFO where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
     </select>
@@ -26,7 +31,7 @@
         and a.yq in (select yq from lab_instr)
         and (select count(1) from v_LAR_EXAM_INFO c where a.ybh=c.ybh and a.yq=c.yq and a.jyrq=c.jyrq)>0
         and (select count(1) from lab_uploadreport_pt d where a.ybh=d.ybh and a.yq=d.yq and a.jyrq=d.jyrq)<=0
-        and  a.jyrq>= '2024-01-01'
+        and  a.jyrq>= '2024-01-01' and a.jyrq <= '2024-12-31'
         ]]>
     </select>