jiangjiazhi / regional-platform

Commit 3e73044e15a9df4d95c937fef30339a874e1925f

Authored by Administrator over 5 years ago

Exists in master and in 6 other branches

叶酸update

Showing 3 changed files with 37 additions and 15 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java

...	...	@@ -38,6 +38,7 @@
38	38	<result column="hospitalid" property="hospitalId"/>
39	39	<result column="modify" property="modify"/>
40	40	<result column="receivesum" property="receiveSum"/>
	41	+ <result column="drawTime" property="drawTime"/>
41	42	</resultMap>
42	43
43	44
44	45
45	46
46	47
...	...	@@ -76,20 +77,22 @@
76	77	created AS created,
77	78	vc_card AS vcCard,
78	79	receivesum as receiveSum,
79		- hospitalid as hospitalId
	80	+ hospitalid as hospitalId,
	81	+ drawTime as drawTime
80	82	FROM
81	83	lyms_folvite_Info
82		- <include refid="sqlWhere"/>
	84	+ <include refid="whereSql"/>
83	85	</select>
84	86
85		- <select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultType="java.lang.Integer">
86		- select count(id) from lyms_folvite_Info
87		- <include refid="sqlWhere"/>
	87	+ <select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
	88	+ resultType="java.lang.Integer">
	89	+ select count(id) from lyms_folvite_Info
	90	+ <include refid="whereSql"/>
88	91	</select>
89	92
90	93
91		-
92		- <select id="queryFolviteList" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultMap="folviteResultMap">
	94	+ <select id="queryFolviteList" parameterType="com.lyms.platform.permission.model.FolviteQuery"
	95	+ resultMap="folviteResultMap">
93	96	SELECT
94	97	id AS id,
95	98	NAME AS NAME,
...	...	@@ -124,7 +127,8 @@
124	127	created AS created,
125	128	vc_card AS vcCard,
126	129	receivesum as receiveSum,
127		- hospitalid as hospitalId
	130	+ hospitalid as hospitalId,
	131	+ drawTime as drawTime
128	132	FROM
129	133	lyms_folvite_Info
130	134	<include refid="whereSql"/>
...	...	@@ -166,7 +170,8 @@
166	170	created,
167	171	vc_card,
168	172	hospitalid,
169		- receivesum
	173	+ receivesum,
	174	+ drawTime
170	175	)
171	176	VALUES
172	177	(
...	...	@@ -204,6 +209,7 @@
204	209	#{vcCard,jdbcType=VARCHAR},
205	210	#{hospitalid,jdbcType=VARCHAR},
206	211	#{receivesum,jdbcType=INTEGER})
	212	+ #{drawTime,jdbcType=TIMESTAMP}
207	213	</insert>
208	214
209	215
...	...	@@ -340,6 +346,9 @@
340	346	</if>
341	347	<if test="modify != null">
342	348	modify=#{modify,jdbcType=TIMESTAMP},
	349	+ </if>
	350	+ <if test="drawTime !=null">
	351	+ drawTime=#{drawTime,jdbcType=TIMESTAMP}
343	352	</if>
344	353
345	354	</set>

...	...	@@ -26,7 +26,8 @@
26	26	ISSUER,
27	27	receive_date,
28	28	creation_date,
29		- modified
	29	+ modified,
	30	+ isconceive
30	31	)
31	32	VALUES
32	33	(
33	34
...	...	@@ -40,9 +41,11 @@
40	41	#{receiveDate,jdbcType=TIMESTAMP},
41	42	#{creationDate,jdbcType=TIMESTAMP},
42	43	#{modified,jdbcType=TIMESTAMP})
	44	+ #{isconceive,jdbcType=INTEGER}
43	45	</insert>
44	46
45		- <select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultMap="folviteReceiveResultMap">
	47	+ <select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
	48	+ resultMap="folviteReceiveResultMap">
46	49	SELECT
47	50	id AS id,
48	51	folvite_id AS folviteId,
...	...	@@ -53,7 +56,8 @@
53	56	ISSUER AS ISSUER,
54	57	receive_date AS receiveDate,
55	58	creation_date AS creationDate,
56		- modified AS modified
	59	+ modified AS modified,
	60	+ isconceive as isconceive
57	61	FROM
58	62	lyms_folvite_provide
59	63	<include refid="whereSql"/>
60	64
...	...	@@ -70,8 +74,13 @@
70	74	<sql id="whereSql">
71	75	1=1
72	76	<where>
	77	+ <if test="folviteId != null">
	78	+ and folviteId=#{folviteId}
	79	+ </if>
	80	+ <if test="">
	81	+ and id=#{id}
	82	+ </if>
73	83
74		-
75	84	</where>
76	85
77	86
...	...	@@ -116,6 +125,10 @@
116	125	<if test="modified != null">
117	126	modified=#{modified,jdbcType=TIMESTAMP},
118	127	</if>
	128	+ <if test="isconceive != null">
	129	+ isconceive=#{isconceive,jdbcType=INTEGER}
	130	+ </if>
	131	+
119	132	</set>
120	133	</sql>
121	134
...	...	@@ -131,7 +144,8 @@
131	144	ISSUER AS ISSUER,
132	145	receive_date AS receiveDate,
133	146	creation_date AS creationDate,
134		- modified AS modified
	147	+ modified AS modified,
	148	+ isconceive as isconceive
135	149	FROM
136	150	lyms_folvite_provide
137	151	where id=#{id,jdbcType=VARCHAR}

...	...	@@ -6,7 +6,6 @@
6	6	import com.lyms.platform.operate.web.service.FolviteService;
7	7	import com.lyms.platform.pojo.FolviteReceiveRecordModel;
8	8	import com.lyms.platform.pojo.FolviteRecordModel;
9		-import org.apache.ibatis.annotations.Param;
10	9	import org.springframework.beans.factory.annotation.Autowired;
11	10	import org.springframework.stereotype.Controller;
12	11	import org.springframework.web.bind.annotation.*;