jiangjiazhi / regional-platform

Commit af79640dbad6f9eb7b15073f645d4a70c5b59eb7

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

服务

Showing 2 changed files with 84 additions and 5 deletions

platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java

...	...	@@ -127,6 +127,47 @@
127	127	<if test="perType != null and perType != ''">
128	128	per_type = #{perType,jdbcType=INTEGER},
129	129	</if>
	130	+
	131	+ <if test="device != null and device >= 0">
	132	+ device = #{device,jdbcType=INTEGER},
	133	+ </if>
	134	+ <if test="deviceCon != null and deviceCon >= 0">
	135	+ deviceCon = #{deviceCon,jdbcType=INTEGER},
	136	+ </if>
	137	+ <if test="doctorWeek != null and doctorWeek >= 0">
	138	+ doctorWeek = #{doctorWeek,jdbcType=INTEGER},
	139	+ </if>
	140	+ <if test="serviceWeek != null serviceWeek >= 0">
	141	+ serviceWeek = #{serviceWeek,jdbcType=INTEGER},
	142	+ </if>
	143	+ <if test="serStartWeek != null and serStartWeek >= 0">
	144	+ serStartWeek = #{serStartWeek,jdbcType=INTEGER},
	145	+ </if>
	146	+ <if test="serEndWeek != null and serEndWeek >= 0">
	147	+ status = #{status,jdbcType=INTEGER},
	148	+ </if>
	149	+ <if test="docStartWeek != null and docStartWeek >= 0">
	150	+ docStartWeek = #{docStartWeek,jdbcType=INTEGER},
	151	+ </if>
	152	+ <if test="docEndWeek != null and docEndWeek >= 0">
	153	+ docEndWeek = #{docEndWeek,jdbcType=INTEGER},
	154	+ </if>
	155	+
	156	+ <if test="serStartTime != null">
	157	+ serStartTime = #{serStartTime,jdbcType=TIMESTAMP},
	158	+ </if>
	159	+
	160	+ <if test="serEndTime != null">
	161	+ serEndTime = #{serEndTime,jdbcType=TIMESTAMP},
	162	+ </if>
	163	+
	164	+ <if test="docStartTime != null">
	165	+ docStartTime = #{docStartTime,jdbcType=TIMESTAMP},
	166	+ </if>
	167	+
	168	+ <if test="docEndTime != null">
	169	+ docEndTime = #{docEndTime,jdbcType=TIMESTAMP},
	170	+ </if>
130	171	</set>
131	172	where id = #{id,jdbcType=VARCHAR}
132	173	</update>
...	...	@@ -243,6 +284,48 @@
243	284	<if test="perType != null and perType != ''">
244	285	and per_type = #{perType,jdbcType=INTEGER}
245	286	</if>
	287	+
	288	+ <if test="device != null and device >= 0">
	289	+ and device = #{device,jdbcType=INTEGER}
	290	+ </if>
	291	+ <if test="deviceCon != null and deviceCon >= 0">
	292	+ and deviceCon = #{deviceCon,jdbcType=INTEGER}
	293	+ </if>
	294	+ <if test="doctorWeek != null and doctorWeek >= 0">
	295	+ and doctorWeek = #{doctorWeek,jdbcType=INTEGER}
	296	+ </if>
	297	+ <if test="serviceWeek != null serviceWeek >= 0">
	298	+ and serviceWeek = #{serviceWeek,jdbcType=INTEGER}
	299	+ </if>
	300	+ <if test="serStartWeek != null and serStartWeek >= 0">
	301	+ and serStartWeek = #{serStartWeek,jdbcType=INTEGER}
	302	+ </if>
	303	+ <if test="serEndWeek != null and serEndWeek >= 0">
	304	+ and status = #{status,jdbcType=INTEGER},
	305	+ </if>
	306	+ <if test="docStartWeek != null and docStartWeek >= 0">
	307	+ and docStartWeek = #{docStartWeek,jdbcType=INTEGER}
	308	+ </if>
	309	+ <if test="docEndWeek != null and docEndWeek >= 0">
	310	+ and docEndWeek = #{docEndWeek,jdbcType=INTEGER}
	311	+ </if>
	312	+
	313	+ <if test="serStartTime != null">
	314	+ and serStartTime = #{serStartTime,jdbcType=TIMESTAMP}
	315	+ </if>
	316	+
	317	+ <if test="serEndTime != null">
	318	+ and serEndTime = #{serEndTime,jdbcType=TIMESTAMP}
	319	+ </if>
	320	+
	321	+ <if test="docStartTime != null">
	322	+ and docStartTime = #{docStartTime,jdbcType=TIMESTAMP}
	323	+ </if>
	324	+
	325	+ <if test="docEndTime != null">
	326	+ and docEndTime = #{docEndTime,jdbcType=TIMESTAMP}
	327	+ </if>
	328	+
246	329	<if test="sql != null and sql != ''">
247	330	${sql}
248	331	</if>

...	...	@@ -893,11 +893,7 @@
893	893	}
894	894
895	895	private Double getMathRound(Double kcal) {
896		- if ((kcal) % 100 == 0)
897		- {
898		- return kcal;
899		- }
900		- else
	896	+ if (kcal % 100 != 0)
901	897	{
902	898	kcal+=50;
903	899	}