jiangjiazhi / regional-platform

Commit 719ff4aaa8adb06228e57a5a1b02ba15b23427a5

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 5 changed files with 38 additions and 12 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java

...	...	@@ -81,6 +81,18 @@
81	81	* 退款人
82	82	*/
83	83	private String backUser;
	84	+ /**
	85	+ * 订单号
	86	+ */
	87	+ private String orderId;
	88	+
	89	+ public String getOrderId() {
	90	+ return orderId;
	91	+ }
	92	+
	93	+ public void setOrderId(String orderId) {
	94	+ this.orderId = orderId;
	95	+ }
84	96
85	97	public String getSerTypes() {
86	98	return serTypes;

...	...	@@ -55,6 +55,19 @@
55	55	*/
56	56	private String backUser;
57	57
	58	+ /**
	59	+ * 订单号
	60	+ */
	61	+ private String orderId;
	62	+
	63	+ public String getOrderId() {
	64	+ return orderId;
	65	+ }
	66	+
	67	+ public void setOrderId(String orderId) {
	68	+ this.orderId = orderId;
	69	+ }
	70	+
58	71	public Date getBackDate() {
59	72	return backDate;
60	73	}

...	...	@@ -22,12 +22,13 @@
22	22	<result column="receive_user" property="receiveUser" jdbcType="VARCHAR" />
23	23	<result column="back_date" property="backDate" jdbcType="TIMESTAMP" />
24	24	<result column="back_user" property="backUser" jdbcType="VARCHAR" />
	25	+ <result column="order_id" property="orderId" jdbcType="VARCHAR" />
25	26	</resultMap>
26	27
27	28
28	29
29	30	<insert id="addPatientService" parameterType="com.lyms.platform.permission.model.PatientService">
30		- insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser})
	31	+ insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId})
31	32	</insert>
32	33
33	34
...	...	@@ -87,6 +88,9 @@
87	88	<if test="backUser != null and backUser != ''">
88	89	back_user = #{backUser,jdbcType=VARCHAR},
89	90	</if>
	91	+ <if test="orderId != null and orderId != ''">
	92	+ order_id = #{orderId,jdbcType=VARCHAR},
	93	+ </if>
90	94	</set>
91	95	where id = #{id,jdbcType=VARCHAR}
92	96	</update>
...	...	@@ -99,7 +103,7 @@
99	103
100	104
101	105	<select id="getPatientService" resultMap="PatientServiceResultMap" parameterType="java.lang.String">
102		- select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user
	106	+ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id
103	107	from patient_service where id = #{id,jdbcType=VARCHAR}
104	108	</select>
105	109
...	...	@@ -113,8 +117,6 @@
113	117	</if>
114	118	</sql>
115	119
116		-
117		-
118	120	<sql id="PatientServiceCondition">
119	121	<where>
120	122	1 = 1
121	123
122	124
123	125
124	126
...	...	@@ -194,29 +196,26 @@
194	196	<if test="backUser != null and backUser != ''">
195	197	and back_user = #{backUser,jdbcType=VARCHAR}
196	198	</if>
	199	+ <if test="orderId != null and orderId != ''">
	200	+ and order_id = #{orderId,jdbcType=VARCHAR}
	201	+ </if>
197	202	<if test="sql != null and sql != ''">
198	203	${sql}
199	204	</if>
200	205	</where>
201	206	</sql>
202	207
203		-
204		-
205	208	<select id="queryPatientService" resultMap="PatientServiceResultMap" parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
206		- select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user
	209	+ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id
207	210	from patient_service
208	211	<include refid="PatientServiceCondition" />
209	212	<include refid="orderAndLimit" />
210	213	</select>
211	214
212		-
213		-
214	215	<select id="queryPatientServiceCount" resultType="int" parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
215	216	select count(1) from patient_service
216	217	<include refid="PatientServiceCondition" />
217	218	</select>
218		-
219		-
220	219
221	220	</mapper>

...	...	@@ -20,7 +20,7 @@
20	20	/**
21	21	* @auther yangfei
22	22	* @createTime 2017年09月11日 11时36分
23		- * @discription
	23	+ * @discription 服务开通相关
24	24	*/
25	25	@Controller
26	26	public class PatientServiceController extends BaseController {

...	...	@@ -354,6 +354,8 @@
354	354	} else if (null != patientMarkRequest.getcDueWeekStart() \|\| null != patientMarkRequest.getcDueWeekEnd()) {
355	355	return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
356	356	}
	357	+ patientMarkHospQuery.setMakeStartDate(patientMarkRequest.getMakeStartDate());
	358	+ patientMarkHospQuery.setMakeEndDate(patientMarkRequest.getMakeEndDate());
357	359
358	360	//列数据
359	361	List<String> legendData = new ArrayList<>();