diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java index 162e21e..0e9b185 100644 --- a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java +++ b/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.V_TESTDETAILS; -import com.czlisinterface.gzszyy.pojo.V_lab_microbe; -import com.czlisinterface.gzszyy.pojo.V_lab_susceptibility; +import com.czlisinterface.gzszyy.pojo.*; 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 getV_TestRecord(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); List getV_LAR_EXAM_INFO(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); List getV_TESTDETAILS(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); List getV_lab_susceptibility(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_TestRecordMapper.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_TestRecordMapper.java new file mode 100644 index 0000000..e43ddf0 --- /dev/null +++ b/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 { +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_TestRecord.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_TestRecord.java new file mode 100644 index 0000000..b4b05e8 --- /dev/null +++ b/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; +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java index 8944452..74efd77 100644 --- a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java +++ b/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 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 vTestRecordList = lisMapperGzszyy.getV_TestRecord(jyrq,yq,ybh); + for (V_TestRecord vTestRecord : vTestRecordList) { + vTestRecordMapper.insert(vTestRecord); + } + List vLarExamInfoList = lisMapperGzszyy.getV_LAR_EXAM_INFO(jyrq, yq, ybh); for (V_LAR_EXAM_INFO vLarExamInfo : vLarExamInfoList) { vLAR_EXAM_INFOMapper.insert(vLarExamInfo); } diff --git a/lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml b/lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml index a2e6be2..7f8ba04 100644 --- a/lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml +++ b/lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml @@ -2,6 +2,11 @@ + + + @@ -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' ]]>