|
@@ -288,6 +288,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
) a
|
|
|
order by a.cjsj;
|
|
|
</select>
|
|
|
+
|
|
|
+ <select id="thirdNucleicAcid65" resultType="com.ruoyi.system.domain.OdsQssHsjcxx">
|
|
|
+ select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg,sjly
|
|
|
+ from ( select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg,sjly
|
|
|
+ from ods_qss_hsjcxx_all
|
|
|
+ where cjsj > #{startTime} and #{endTime}>=cjsj
|
|
|
+ and sjly != '东软系统'
|
|
|
+ and SUBSTRING(sfzhm, 1,2) = '65'
|
|
|
+
|
|
|
+ UNION
|
|
|
+
|
|
|
+ SELECT s.id_card_no as sfzhm,
|
|
|
+ s.user_name as xm,
|
|
|
+ s.user_phone as sjhm,
|
|
|
+ s.collect_datetime as cjsj,
|
|
|
+ testing_datetime as jgcjsj,
|
|
|
+ s.collect_site_name as jcdd,
|
|
|
+ sign_name as jcjg,
|
|
|
+ c.town as sjly
|
|
|
+ FROM `tb_whole_testing_sample_921` s
|
|
|
+ LEFT JOIN tb_whole_testing_result_921 r on s.id = r.id
|
|
|
+ LEFT JOIN tb_whole_collect_site_city c on s.collect_site_code = c.id
|
|
|
+ where s.collect_datetime > #{startTime} and #{endTime}>=s.collect_datetime
|
|
|
+ and SUBSTRING(s.id_card_no, 1,2) = '65')a
|
|
|
+ order by a.cjsj;
|
|
|
+ </select>
|
|
|
+
|
|
|
<select id="selectUserInfoNew" resultMap="UserInfoResult">
|
|
|
<include refid="selectUserInfoVo"/>
|
|
|
where dept_id = #{deptId}
|
|
@@ -300,4 +327,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</select>
|
|
|
|
|
|
|
|
|
+
|
|
|
</mapper>
|