|
|
@@ -76,9 +76,9 @@
|
|
|
<result property="kfpjf" column="kfpjf"/>
|
|
|
<result property="relatedService" column="related_service"/>
|
|
|
<result property="scorePackageName" column="score_package_name"/>
|
|
|
- <result property="endLabelDate" column="end_label_date" />
|
|
|
- <result property="packageIsConduct" column="package_is_conduct" />
|
|
|
- <result property="ruleId" column="rule_id" />
|
|
|
+ <result property="endLabelDate" column="end_label_date"/>
|
|
|
+ <result property="packageIsConduct" column="package_is_conduct"/>
|
|
|
+ <result property="ruleId" column="rule_id"/>
|
|
|
<result property="packageFinishTime" column="package_finish_time"/>
|
|
|
<result property="packageType2" column="package_type2"/>
|
|
|
<result property="userNum" column="user_num"/>
|
|
|
@@ -97,7 +97,8 @@
|
|
|
|
|
|
<select id="listWmScorePackageAndTask" resultMap="wmScorePackageMap">
|
|
|
select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,
|
|
|
- xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,settlement_date,
|
|
|
+ xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,settlement_date,
|
|
|
update_time, update_user
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package,(
|
|
|
select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
@@ -117,17 +118,18 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectByRelationScoreIdList" resultMap="wmScorePackageMap">
|
|
|
- select
|
|
|
- *
|
|
|
- from wm_score_package
|
|
|
- where
|
|
|
- relation_score_id = #{relationScoreId,jdbcType=VARCHAR}
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id = #{relationScoreId,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
|
|
|
<select id="listWmScorePackageAndTaskExt" resultMap="wmScorePackageMap">
|
|
|
- select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,score_package_status,settlement_date,
|
|
|
- xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,send_package_dept_id,old_package,
|
|
|
- update_time, update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
+ select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id,
|
|
|
+ zb_id,score_package_status,settlement_date,
|
|
|
+ xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,send_package_dept_id,old_package,
|
|
|
+ update_time,
|
|
|
+ update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package LEFT JOIN (
|
|
|
select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
ysh,sum(if(task_status=2,score,0)) dsh from wm_task where score_package_id is not null and wm_task.del_flag=0
|
|
|
@@ -187,9 +189,12 @@
|
|
|
|
|
|
|
|
|
<select id="listWmScorePackageAndTaskExtOld" resultMap="wmScorePackageMap">
|
|
|
- select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,score_package_status,settlement_date,
|
|
|
- xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,send_package_dept_id,old_package,
|
|
|
- update_time, update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
+ select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id,
|
|
|
+ zb_id,score_package_status,settlement_date,
|
|
|
+ xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,send_package_dept_id,old_package,
|
|
|
+ update_time,
|
|
|
+ update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package LEFT JOIN (
|
|
|
select score_package_drug_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
ysh,sum(if(task_status=2,score,0)) dsh from wm_task where score_package_id is not null and wm_task.del_flag=0
|
|
|
@@ -248,11 +253,13 @@
|
|
|
</select>
|
|
|
|
|
|
|
|
|
-
|
|
|
<select id="listWmScorePackageAndTaskExt2" resultMap="wmScorePackageMap">
|
|
|
- select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,score_package_status,settlement_date,
|
|
|
- xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,send_package_dept_id,old_package,
|
|
|
- update_time, update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
+ select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id,
|
|
|
+ zb_id,score_package_status,settlement_date,
|
|
|
+ xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,send_package_dept_id,old_package,
|
|
|
+ update_time,
|
|
|
+ update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package LEFT JOIN (
|
|
|
select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
ysh,sum(if(task_status=2,score,0)) dsh from wm_task where score_package_id is not null and wm_task.del_flag=0
|
|
|
@@ -304,9 +311,12 @@
|
|
|
|
|
|
|
|
|
<select id="listWmScorePackageAndTaskExt2Old" resultMap="wmScorePackageMap">
|
|
|
- select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,score_package_status,settlement_date,
|
|
|
- xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,send_package_dept_id,old_package,
|
|
|
- update_time, update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
+ select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id,
|
|
|
+ zb_id,score_package_status,settlement_date,
|
|
|
+ xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,send_package_dept_id,old_package,
|
|
|
+ update_time,
|
|
|
+ update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package LEFT JOIN (
|
|
|
select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
ysh,sum(if(task_status=2,score,0)) dsh from wm_task where score_package_id is not null and wm_task.del_flag=0
|
|
|
@@ -358,7 +368,8 @@
|
|
|
|
|
|
<select id="listWmScorePackageAndTaskLevel1" resultMap="wmScorePackageMap">
|
|
|
select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,
|
|
|
- xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,settlement_date,
|
|
|
+ xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,settlement_date,
|
|
|
update_time, update_user
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package,(
|
|
|
select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
@@ -386,7 +397,8 @@
|
|
|
|
|
|
<select id="listWmScorePackageAndTaskLevel3" resultMap="wmScorePackageMap">
|
|
|
select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,
|
|
|
- xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,settlement_date,
|
|
|
+ xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,settlement_date,
|
|
|
update_time, update_user
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package,(
|
|
|
select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
@@ -414,7 +426,8 @@
|
|
|
union
|
|
|
|
|
|
select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,
|
|
|
- xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,settlement_date,
|
|
|
+ xxdb_id, typeid, package_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
|
|
|
+ create_user,settlement_date,
|
|
|
update_time, update_user
|
|
|
,bb.ytj,bb.ysh,bb.dsh from wm_score_package,(
|
|
|
select score_package_level1_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
|
|
|
@@ -662,34 +675,53 @@
|
|
|
order by id desc
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectByScoreId" resultMap="wmScorePackageMap" parameterType="java.lang.String" >
|
|
|
- select o.*,u.name as acceptSug
|
|
|
- from wm_score_package o
|
|
|
- left join sys_dept u on u.dept_id=o.accept_sug
|
|
|
- where o.id = #{id,jdbcType=INTEGER}
|
|
|
+ <select id="selectByScoreId" resultMap="wmScorePackageMap" parameterType="java.lang.String">
|
|
|
+ SELECT o.*, u.name AS acceptsug
|
|
|
+ FROM wm_score_package o
|
|
|
+ LEFT JOIN sys_dept u ON u.dept_id = o.accept_sug
|
|
|
+ WHERE o.id = #{id,jdbcType=INTEGER}
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectByScoreIds" resultMap="wmScorePackageMap" parameterType="java.lang.String" >
|
|
|
- select
|
|
|
- *
|
|
|
- from wm_score_package
|
|
|
- where relation_score_id = #{relationScoreId,jdbcType=VARCHAR}
|
|
|
+ <select id="selectByScoreIds" resultMap="wmScorePackageMap" parameterType="java.lang.String">
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id = #{relationScoreId,jdbcType=VARCHAR}
|
|
|
+ </select>
|
|
|
+
|
|
|
+ <select id="selectByName" resultMap="wmScorePackageMap" parameterType="java.lang.String">
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE score_package_name = #{scorePackageName,jdbcType=VARCHAR}
|
|
|
+ AND dept_id = #{deptId,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectByName" resultMap="wmScorePackageMap" parameterType="java.lang.String" >
|
|
|
+ <select id="newSelectWmScorePackageLists" resultMap="wmScorePackageMap" parameterType="java.util.HashMap">
|
|
|
select
|
|
|
- *
|
|
|
- from wm_score_package
|
|
|
- where
|
|
|
- score_package_name = #{scorePackageName,jdbcType=VARCHAR}
|
|
|
- and
|
|
|
- dept_id = #{deptId,jdbcType=VARCHAR}
|
|
|
+ o.*,
|
|
|
+ u.name as acceptSug
|
|
|
+ from wm_score_package o
|
|
|
+ left join sys_dept u on u.dept_id = o.accept_sug
|
|
|
+ <where>
|
|
|
+ o.typeid not in ('3','4')
|
|
|
+ and o.old_package = '0'
|
|
|
+ AND o.send_package_dept_id = #{sendDeptId}
|
|
|
+ <if test="scorePackageName != null">
|
|
|
+ AND o.score_package_name like CONCAT('%',#{scorePackageName},'%')
|
|
|
+ </if>
|
|
|
+ <if test="allocationDate != null and endLabelDate != null">
|
|
|
+ AND (o.allocation_date BETWEEN #{allocationDate} AND #{endLabelDate})
|
|
|
+ </if>
|
|
|
+ <if test="acceptSug != null">
|
|
|
+ AND o.accept_sug = #{acceptSug}
|
|
|
+ </if>
|
|
|
+ </where>
|
|
|
+ order by id desc, create_time DESC
|
|
|
</select>
|
|
|
|
|
|
<select id="selectWmScorePackageLists" resultMap="wmScorePackageMap" parameterType="java.util.HashMap">
|
|
|
select o.*,u.name as acceptSug
|
|
|
from wm_score_package o
|
|
|
- left join sys_dept u on u.dept_id=o.accept_sug
|
|
|
+ left join sys_dept u on u.dept_id=o.accept_sug
|
|
|
where 1 = 1 and o.typeid not in (3,4)
|
|
|
<if test="query.id != null">
|
|
|
AND o.id != #{query.id,jdbcType=INTEGER}
|
|
|
@@ -755,7 +787,7 @@
|
|
|
<select id="listWmScorePackages" resultMap="wmScorePackageMap" parameterType="java.util.HashMap">
|
|
|
select o.*,u.name as acceptSug
|
|
|
from wm_score_package o
|
|
|
- left join sys_dept u on u.dept_id=o.accept_sug
|
|
|
+ left join sys_dept u on u.dept_id=o.accept_sug
|
|
|
where 1 = 1 and enable_flag='0'
|
|
|
<if test="id != null">
|
|
|
AND o.id != #{id,jdbcType=INTEGER}
|
|
|
@@ -817,28 +849,27 @@
|
|
|
order by id desc
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectBywmId" resultMap="wmScorePackageMap" parameterType="java.lang.String" >
|
|
|
- select
|
|
|
- *
|
|
|
- from wm_score_package
|
|
|
- where id = #{id,jdbcType=VARCHAR}
|
|
|
+ <select id="selectBywmId" resultMap="wmScorePackageMap" parameterType="java.lang.String">
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE id = #{id,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectByRelationScoreId" resultMap="wmScorePackageMap" parameterType="java.lang.String" >
|
|
|
- select
|
|
|
- *
|
|
|
- from wm_score_package
|
|
|
- where score_id = #{scoreId,jdbcType=VARCHAR}
|
|
|
+ <select id="selectByRelationScoreId" resultMap="wmScorePackageMap" parameterType="java.lang.String">
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE score_id = #{scoreId,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectRelationScoreId" resultMap="wmScorePackageMap" parameterType="java.lang.String" >
|
|
|
- select
|
|
|
- *
|
|
|
- from wm_score_package
|
|
|
- where id != #{id,jdbcType=VARCHAR} and enable_flag='0' and typeid not in(3,4)
|
|
|
+ <select id="selectRelationScoreId" resultMap="wmScorePackageMap" parameterType="java.lang.String">
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE id != #{id,jdbcType=VARCHAR}
|
|
|
+ AND enable_flag = '0'
|
|
|
+ AND typeid NOT IN (3, 4)
|
|
|
ORDER BY id DESC
|
|
|
</select>
|
|
|
- <select id="selectByReRelatedService" resultMap="wmScorePackageMap" parameterType="java.lang.String" >
|
|
|
+ <select id="selectByReRelatedService" resultMap="wmScorePackageMap" parameterType="java.lang.String">
|
|
|
select
|
|
|
*
|
|
|
from wm_score_package
|
|
|
@@ -853,91 +884,159 @@
|
|
|
</select>
|
|
|
|
|
|
|
|
|
-
|
|
|
<select id="selectByPackage" resultMap="wmScorePackageMap">
|
|
|
- select
|
|
|
- *
|
|
|
- from wm_score_package
|
|
|
- where id = #{id,jdbcType=VARCHAR}
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE id = #{id,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
|
|
|
<select id="selectListById" resultType="java.util.HashMap">
|
|
|
- select
|
|
|
- *
|
|
|
- from
|
|
|
- wm_score_package
|
|
|
- where
|
|
|
- id = #{query.id,jdbcType=VARCHAR}
|
|
|
- and
|
|
|
- settle_status = #{query.settleStatus,jdbcType=BIGINT}
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE id = #{query.id,jdbcType=VARCHAR}
|
|
|
+ AND settle_status = #{query.settleStatus,jdbcType=BIGINT}
|
|
|
</select>
|
|
|
|
|
|
<select id="selectLists" resultMap="wmScorePackageMap">
|
|
|
- select
|
|
|
- *
|
|
|
- from
|
|
|
- wm_score_package
|
|
|
- where
|
|
|
- relation_score_id = #{query.relationScoreId,jdbcType=VARCHAR}
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id = #{query.relationScoreId,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
<select id="finishRate" resultMap="wmScorePackageMap">
|
|
|
- select sum(ifnull(c.payScore,0)) pay_score ,sum(c.ysh) ysh
|
|
|
- from (
|
|
|
- select 0 as payScore, a.ysh from (
|
|
|
- select score_package_id,sum(if(task_status=3,score,0)) ysh from wm_task where wm_task.score_package_id in
|
|
|
- (
|
|
|
- select id from wm_score_package where id=#{query.id}
|
|
|
- union all
|
|
|
- select id from wm_score_package where relation_score_id in (select id from wm_score_package where id=#{query.id})
|
|
|
- union all
|
|
|
- select id from wm_score_package where relation_score_id in (
|
|
|
- select id from wm_score_package where relation_score_id in (select id from wm_score_package where id=#{query.id})
|
|
|
- )
|
|
|
- )
|
|
|
- and wm_task.enable_flag=0 and wm_task.real_flag = '0' and score_package_id is not null and wm_task.del_flag=0
|
|
|
- group by score_package_id
|
|
|
- )a,wm_score_package b, wm_score_package c where a.score_package_id=b.id and b.relation_score_id=c.id and
|
|
|
- (b.relation_score_id = #{query.id} or c.relation_score_id = #{query.id})
|
|
|
- union all
|
|
|
- select sum(score) as payScore,0 as ysh from wm_task where
|
|
|
- (report_drug_approval_opinion=1 or report_one_approval_opinion=1) and (report_one_id in (
|
|
|
- select id from wm_report where report_status=6 and score_id=#{query.id})
|
|
|
- or report_second_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
|
|
|
- or report_drug_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
|
|
|
- )
|
|
|
- ) c
|
|
|
+ SELECT SUM(IFNULL(c.payscore, 0)) pay_score, SUM(c.ysh) ysh
|
|
|
+ FROM (
|
|
|
+ SELECT 0 AS payscore, a.ysh
|
|
|
+ FROM (
|
|
|
+ SELECT score_package_id, SUM(IF(task_status = 3, score, 0)) ysh
|
|
|
+ FROM wm_task
|
|
|
+ WHERE wm_task.score_package_id IN
|
|
|
+ (
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE id = #{query.id}
|
|
|
+ UNION ALL
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id IN (SELECT id FROM wm_score_package WHERE id = #{query.id})
|
|
|
+ UNION ALL
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id IN (
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id IN
|
|
|
+ (SELECT id FROM wm_score_package WHERE id = #{query.id})
|
|
|
+ )
|
|
|
+ )
|
|
|
+ AND wm_task.enable_flag = 0
|
|
|
+ AND wm_task.real_flag = '0'
|
|
|
+ AND score_package_id IS NOT NULL
|
|
|
+ AND wm_task.del_flag = 0
|
|
|
+ GROUP BY score_package_id
|
|
|
+ ) a,
|
|
|
+ wm_score_package b,
|
|
|
+ wm_score_package c
|
|
|
+ WHERE a.score_package_id = b.id
|
|
|
+ AND b.relation_score_id = c.id
|
|
|
+ AND (b.relation_score_id = #{query.id} OR c.relation_score_id = #{query.id})
|
|
|
+ UNION ALL
|
|
|
+ SELECT SUM(score) AS payscore, 0 AS ysh
|
|
|
+ FROM wm_task
|
|
|
+ WHERE (report_drug_approval_opinion = 1 OR report_one_approval_opinion = 1)
|
|
|
+ AND (report_one_id IN (
|
|
|
+ SELECT id
|
|
|
+ FROM wm_report
|
|
|
+ WHERE report_status = 6 AND score_id = #{query.id})
|
|
|
+ OR report_second_id IN
|
|
|
+ (SELECT id FROM wm_report WHERE report_status = 6 AND score_id = #{query.id})
|
|
|
+ OR report_drug_id IN (SELECT id FROM wm_report WHERE report_status = 6 AND score_id = #{query.id})
|
|
|
+ )
|
|
|
+ ) c
|
|
|
</select>
|
|
|
+
|
|
|
+ <select id="newFinishRate" resultMap="wmScorePackageMap">
|
|
|
+ SELECT SUM(IFNULL(c.payscore, 0)) pay_score, SUM(c.ysh) ysh
|
|
|
+ FROM (
|
|
|
+ SELECT 0 AS payscore, a.ysh
|
|
|
+ FROM (
|
|
|
+ SELECT score_package_id, SUM(IF(task_status = 3, score, 0)) ysh
|
|
|
+ FROM wm_task
|
|
|
+ WHERE wm_task.score_package_id IN
|
|
|
+ (
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE id = #{query.id}
|
|
|
+ UNION ALL
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id IN (SELECT id FROM wm_score_package WHERE id = #{query.id})
|
|
|
+ UNION ALL
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id IN (
|
|
|
+ SELECT id
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id IN
|
|
|
+ (SELECT id FROM wm_score_package WHERE id = #{query.id})
|
|
|
+ )
|
|
|
+ )
|
|
|
+ AND wm_task.enable_flag = 0
|
|
|
+ AND wm_task.real_flag = '0'
|
|
|
+ AND wm_task.del_flag = 0
|
|
|
+ GROUP BY score_package_id
|
|
|
+ ) a,
|
|
|
+ wm_score_package b,
|
|
|
+ wm_score_package c
|
|
|
+ WHERE a.score_package_id = b.id
|
|
|
+ AND b.relation_score_id = c.id
|
|
|
+ AND (b.relation_score_id = #{query.id} OR c.relation_score_id = #{query.id})
|
|
|
+ UNION ALL
|
|
|
+ SELECT SUM(score) AS payscore, 0 AS ysh
|
|
|
+ FROM wm_task
|
|
|
+ WHERE (report_drug_approval_opinion = 1 OR report_one_approval_opinion = 1)
|
|
|
+ AND (report_one_id IN (
|
|
|
+ SELECT id
|
|
|
+ FROM wm_report
|
|
|
+ WHERE report_status = 6 AND score_id = #{query.id})
|
|
|
+ OR report_second_id IN
|
|
|
+ (SELECT id FROM wm_report WHERE report_status = 6 AND score_id = #{query.id})
|
|
|
+ OR report_drug_id IN (SELECT id FROM wm_report WHERE report_status = 6 AND score_id = #{query.id})
|
|
|
+ )
|
|
|
+ ) c
|
|
|
+ </select>
|
|
|
+
|
|
|
+
|
|
|
<select id="getScorePackagekfpjf" resultMap="wmScorePackageMap">
|
|
|
select
|
|
|
- dd.*
|
|
|
+ dd.*
|
|
|
from (
|
|
|
- select
|
|
|
- p.id,
|
|
|
- p.score,
|
|
|
- p.score_package_name,
|
|
|
- p.score_id,
|
|
|
- p.package_type1,
|
|
|
- p.drug_producer,
|
|
|
- p.score-sum(if(p1.del_flag='0' and p1.enable_flag='0' and p1.score_package_status != '6',p1.score,0)) as kfpjf
|
|
|
- from wm_score_package p
|
|
|
- left join wm_score_package p1 on p.id=p1.relation_score_id and p1.del_flag='0' and p1.enable_flag='0'
|
|
|
-
|
|
|
- <where>
|
|
|
- p.del_flag='0' and p.enable_flag='0' and p.old_package='0'
|
|
|
- <if test="query.deptId != null and query.deptId != ''">
|
|
|
- AND p.dept_id= #{query.deptId}
|
|
|
- </if>
|
|
|
- <if test="query.sendPackageDeptId != null and query.sendPackageDeptId != ''">
|
|
|
- AND p.send_package_dept_id= #{query.sendPackageDeptId}
|
|
|
- </if>
|
|
|
- <if test="query.typeid != null and query.typeid != ''">
|
|
|
- AND p.typeid IN(${query.typeid})
|
|
|
- </if>
|
|
|
- <if test="query.id != null and query.id != ''">
|
|
|
- AND p.id IN(${query.id})
|
|
|
- </if>
|
|
|
- </where>
|
|
|
- group by p.id,p.score,p.score_package_name,p.score_id,p.package_type1
|
|
|
+ select
|
|
|
+ p.id,
|
|
|
+ p.score,
|
|
|
+ p.score_package_name,
|
|
|
+ p.score_id,
|
|
|
+ p.package_type1,
|
|
|
+ p.drug_producer,
|
|
|
+ p.score-sum(if(p1.del_flag='0' and p1.enable_flag='0' and p1.score_package_status != '6',p1.score,0)) as kfpjf
|
|
|
+ from wm_score_package p
|
|
|
+ left join wm_score_package p1 on p.id=p1.relation_score_id and p1.del_flag='0' and p1.enable_flag='0'
|
|
|
+
|
|
|
+ <where>
|
|
|
+ p.del_flag='0' and p.enable_flag='0' and p.old_package='0'
|
|
|
+ <if test="query.deptId != null and query.deptId != ''">
|
|
|
+ AND p.dept_id= #{query.deptId}
|
|
|
+ </if>
|
|
|
+ <if test="query.sendPackageDeptId != null and query.sendPackageDeptId != ''">
|
|
|
+ AND p.send_package_dept_id= #{query.sendPackageDeptId}
|
|
|
+ </if>
|
|
|
+ <if test="query.typeid != null and query.typeid != ''">
|
|
|
+ AND p.typeid IN(${query.typeid})
|
|
|
+ </if>
|
|
|
+ <if test="query.id != null and query.id != ''">
|
|
|
+ AND p.id IN(${query.id})
|
|
|
+ </if>
|
|
|
+ </where>
|
|
|
+ group by p.id,p.score,p.score_package_name,p.score_id,p.package_type1
|
|
|
) dd where dd.kfpjf>0
|
|
|
order by dd.id
|
|
|
</select>
|
|
|
@@ -955,7 +1054,7 @@
|
|
|
else ( bb.shbtgnum * 100 / (aa.user_num*aa.task_num) )END AS shbtgtt,
|
|
|
d1.label as package_type1,d2.label as package_type2,
|
|
|
aa.task_rule_id, aa.drug_ent_id, aa.score_id, aa.score_name,
|
|
|
- aa.score, aa.zb_id, aa.xxdb_id, aa.typeid,aa.settlement_date,
|
|
|
+ aa.score, aa.zb_id, aa.xxdb_id, aa.typeid,aa.settlement_date,
|
|
|
aa.package_status, aa.dept_id, aa.del_flag, aa.enable_flag, aa.tenant_id, aa.create_time,
|
|
|
aa.create_user, aa.update_time, aa.update_user,aa.send_package_dept_id,aa.settle_status,
|
|
|
aa.score_package_name,p.score_package_name as relation_score_id,aa.package_user_scope,
|
|
|
@@ -964,25 +1063,25 @@
|
|
|
aa.sub_type, aa.drug_producer
|
|
|
from wm_score_package aa left join (
|
|
|
select score_package_id,
|
|
|
- sum(if(report_drug_approval_opinion =1 or report_one_approval_opinion = 1, score, 0)) shtg,
|
|
|
- sum(if(report_drug_approval_opinion =2 or report_one_approval_opinion = 2, score, 0)) shbtg,
|
|
|
- sum(if(report_drug_approval_opinion =1 or report_one_approval_opinion = 1, 1, 0)) shtgnum,
|
|
|
- sum(if(report_drug_approval_opinion =2 or report_one_approval_opinion = 2, 1, 0)) shbtgnum,
|
|
|
+ sum(if(report_drug_approval_opinion =1 or report_one_approval_opinion = 1, score, 0)) shtg,
|
|
|
+ sum(if(report_drug_approval_opinion =2 or report_one_approval_opinion = 2, score, 0)) shbtg,
|
|
|
+ sum(if(report_drug_approval_opinion =1 or report_one_approval_opinion = 1, 1, 0)) shtgnum,
|
|
|
+ sum(if(report_drug_approval_opinion =2 or report_one_approval_opinion = 2, 1, 0)) shbtgnum,
|
|
|
sum(if(task_status in (1,2,3),score,0)) ytj,sum(if(task_status=3,score,0)) ysh,
|
|
|
sum(IF( task_status = 3, 1, 0 )) yshnum,sum(if(task_status=2,score,0)) dsh
|
|
|
from wm_task
|
|
|
where score_package_id is not null
|
|
|
and wm_task.del_flag=0 and wm_task.enable_flag=0
|
|
|
and wm_task.real_flag=0
|
|
|
- group by score_package_id)
|
|
|
+ group by score_package_id)
|
|
|
bb on aa.id =bb.score_package_id
|
|
|
- left join (select sum(if(`status` IN ('1', '2'), 1, 0)) as yjd,sum(if(`status`=1, 1, 0)) as yjddsh,
|
|
|
+ left join (select sum(if(`status` IN ('1', '2'), 1, 0)) as yjd,sum(if(`status`=1, 1, 0)) as yjddsh,
|
|
|
package_id, user_id from wm_score_package_status
|
|
|
where wm_score_package_status.del_flag='0' and wm_score_package_status.enable_flag='0' group by package_id)
|
|
|
cc on aa.id=cc.package_id
|
|
|
- left join sys_dict_item d1 on d1.type='package_type1' and d1.`value`=aa.package_type1
|
|
|
- left join sys_dict_item d2 on d2.type='package_type2' and d2.`value`=aa.package_type2
|
|
|
- left join wm_score_package p on p.id=aa.relation_score_id
|
|
|
+ left join sys_dict_item d1 on d1.type='package_type1' and d1.`value`=aa.package_type1
|
|
|
+ left join sys_dict_item d2 on d2.type='package_type2' and d2.`value`=aa.package_type2
|
|
|
+ left join wm_score_package p on p.id=aa.relation_score_id
|
|
|
<where>
|
|
|
aa.del_flag='0'
|
|
|
--and aa.enable_flag='0'
|
|
|
@@ -1026,25 +1125,26 @@
|
|
|
order by aa.create_time desc
|
|
|
</select>
|
|
|
<select id="selectRelationScoreIdList" resultMap="wmScorePackageMap">
|
|
|
- select *
|
|
|
- from wm_score_package
|
|
|
- where
|
|
|
- relation_score_id= #{relationScoreId}
|
|
|
+ SELECT *
|
|
|
+ FROM wm_score_package
|
|
|
+ WHERE relation_score_id = #{relationScoreId}
|
|
|
</select>
|
|
|
|
|
|
|
|
|
<select id="getScorePackagePageById" resultMap="wmScorePackageMap">
|
|
|
- select (b.kfpjf)as kfpjf,a.* from wm_score_package a
|
|
|
- left join
|
|
|
- (select p.id,
|
|
|
- p.score-sum(if(p1.del_flag='0' and p1.enable_flag='0',p1.score,0)) as kfpjf
|
|
|
- from wm_score_package p
|
|
|
- left join wm_score_package p1 on p.id=p1.relation_score_id and p1.del_flag='0' and p1.enable_flag='0'
|
|
|
- where
|
|
|
- p.del_flag='0' and p.enable_flag='0'
|
|
|
- group by p.id) b
|
|
|
- on b.id=a.relation_score_id
|
|
|
- where a.id=#{id}
|
|
|
+ SELECT (b.kfpjf) AS kfpjf, a.*
|
|
|
+ FROM wm_score_package a
|
|
|
+ LEFT JOIN
|
|
|
+ (SELECT p.id,
|
|
|
+ p.score - SUM(IF(p1.del_flag = '0' AND p1.enable_flag = '0', p1.score, 0)) AS kfpjf
|
|
|
+ FROM wm_score_package p
|
|
|
+ LEFT JOIN wm_score_package p1
|
|
|
+ ON p.id = p1.relation_score_id AND p1.del_flag = '0' AND p1.enable_flag = '0'
|
|
|
+ WHERE p.del_flag = '0'
|
|
|
+ AND p.enable_flag = '0'
|
|
|
+ GROUP BY p.id) b
|
|
|
+ ON b.id = a.relation_score_id
|
|
|
+ WHERE a.id = #{id}
|
|
|
|
|
|
</select>
|
|
|
<select id="getPackageListForReceive" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput">
|
|
|
@@ -1098,11 +1198,12 @@
|
|
|
select s.package_id from wm_score_package_status s where s.user_id = #{query.zbId} and s.status != 3
|
|
|
)
|
|
|
)
|
|
|
- order by p.create_time desc
|
|
|
+ order by p.create_time desc
|
|
|
</select>
|
|
|
|
|
|
<select id="listPackageSettleList2" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
|
|
|
- SELECT p.id, d. NAME packageEntName, p.score_package_name, p.create_time, p.package_status, p.package_finish_status,
|
|
|
+ SELECT p.id, d. NAME packageEntName, p.score_package_name, p.create_time, p.package_status,
|
|
|
+ p.package_finish_status,
|
|
|
p.settle_status,p.invoice_category, p.settle_amount ,p.package_type1, p.score, wk.ytj, wk.ysh, wk.dsh
|
|
|
FROM wm_score_package p, sys_dept d,
|
|
|
(
|
|
|
@@ -1158,7 +1259,8 @@
|
|
|
|
|
|
<!-- 积分包结算（分页） -->
|
|
|
<select id="listPackageSettleList" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
|
|
|
- SELECT p.id, d.name packageEntName, p.score_package_name, p.create_time, p.package_status, p.package_finish_status,
|
|
|
+ SELECT p.id, d.name packageEntName, p.score_package_name, p.create_time, p.package_status,
|
|
|
+ p.package_finish_status,
|
|
|
p.settle_status,p.invoice_category, p.settle_amount ,p.package_type1, p.score, p.package_type2, p.sub_type
|
|
|
FROM wm_score_package p, sys_dept d
|
|
|
WHERE
|
|
|
@@ -1196,7 +1298,8 @@
|
|
|
|
|
|
<!-- 积分包结算列表 -->
|
|
|
<select id="listAllPackageSettle" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
|
|
|
- SELECT p.id, d.name packageEntName, p.score_package_name, p.create_time, p.package_status, p.package_finish_status,
|
|
|
+ SELECT p.id, d.name packageEntName, p.score_package_name, p.create_time, p.package_status,
|
|
|
+ p.package_finish_status,
|
|
|
p.settle_status, p.invoice_category, p.settle_amount ,p.package_type1, p.score, p.package_type2, p.sub_type
|
|
|
FROM wm_score_package p, sys_dept d
|
|
|
WHERE
|
shc