jiangjiazhi / regional-platform

Commit 661bff8ccb6028b2afec182c190028e83931ae9a

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

服务

Showing 5 changed files with 83 additions and 4 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctServiceQuery.java
platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java

...	...	@@ -36,6 +36,25 @@
36	36
37	37	private Integer syncStatus;
38	38
	39	+ private BigDecimal devicePrice;
	40	+ private Integer deviceCon;//0 无 1全程
	41	+
	42	+ public BigDecimal getDevicePrice() {
	43	+ return devicePrice;
	44	+ }
	45	+
	46	+ public void setDevicePrice(BigDecimal devicePrice) {
	47	+ this.devicePrice = devicePrice;
	48	+ }
	49	+
	50	+ public Integer getDeviceCon() {
	51	+ return deviceCon;
	52	+ }
	53	+
	54	+ public void setDeviceCon(Integer deviceCon) {
	55	+ this.deviceCon = deviceCon;
	56	+ }
	57	+
39	58	public Integer getSyncStatus() {
40	59	return syncStatus;
41	60	}

...	...	@@ -36,6 +36,25 @@
36	36	private Integer status;
37	37	private Integer syncStatus;
38	38
	39	+ private BigDecimal devicePrice;
	40	+ private Integer deviceCon;//0 无 1全程
	41	+
	42	+ public BigDecimal getDevicePrice() {
	43	+ return devicePrice;
	44	+ }
	45	+
	46	+ public void setDevicePrice(BigDecimal devicePrice) {
	47	+ this.devicePrice = devicePrice;
	48	+ }
	49	+
	50	+ public Integer getDeviceCon() {
	51	+ return deviceCon;
	52	+ }
	53	+
	54	+ public void setDeviceCon(Integer deviceCon) {
	55	+ this.deviceCon = deviceCon;
	56	+ }
	57	+
39	58	public Integer getSyncStatus() {
40	59	return syncStatus;
41	60	}

...	...	@@ -8,14 +8,16 @@
8	8	<result column="doct_id" property="doctId" jdbcType="VARCHAR"/>
9	9	<result column="hosp_id" property="hospId" jdbcType="VARCHAR"/>
10	10	<result column="doct_price" property="doctPrice" jdbcType="DECIMAL"/>
	11	+ <result column="devicePrice" property="devicePrice" jdbcType="DECIMAL"/>
	12	+ <result column="deviceCon" property="deviceCon" jdbcType="INTEGER"/>
11	13	<result column="status" property="status" jdbcType="INTEGER"/>
12	14	<result column="sync_status" property="syncStatus" jdbcType="INTEGER"/>
13	15	</resultMap>
14	16
15	17
16	18	<insert id="addHospitalDoctService" parameterType="com.lyms.platform.permission.model.HospitalDoctService">
17		-insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status) values
18		-(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus})
	19	+insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon) values
	20	+(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice},#{deviceCon})
19	21	</insert>
20	22
21	23
22	24
...	...	@@ -34,9 +36,15 @@
34	36	<if test="doctPrice != null">
35	37	doct_price = #{doctPrice,jdbcType=DECIMAL},
36	38	</if>
	39	+ <if test="devicePrice != null">
	40	+ devicePrice = #{devicePrice,jdbcType=DECIMAL},
	41	+ </if>
37	42	<if test="status != null and status >= 0">
38	43	status = #{status,jdbcType=INTEGER},
39	44	</if>
	45	+ <if test="deviceCon != null and deviceCon >= 0">
	46	+ deviceCon = #{deviceCon,jdbcType=INTEGER},
	47	+ </if>
40	48	<if test="syncStatus != null and syncStatus >= 0">
41	49	sync_status = #{syncStatus,jdbcType=INTEGER},
42	50	</if>
43	51
44	52
...	...	@@ -84,19 +92,26 @@
84	92	<if test="doctPrice != null">
85	93	and doct_price = #{doctPrice,jdbcType=DECIMAL}
86	94	</if>
	95	+ <if test="devicePrice != null">
	96	+ and devicePrice = #{devicePrice,jdbcType=DECIMAL}
	97	+ </if>
87	98	<if test="status != null and status >= 0">
88	99	and status = #{status,jdbcType=INTEGER}
89	100	</if>
90	101	<if test="syncStatus != null and syncStatus >= 0">
91	102	and sync_status = #{syncStatus,jdbcType=INTEGER}
92	103	</if>
	104	+
	105	+ <if test="deviceCon != null and deviceCon >= 0">
	106	+ and deviceCon = #{deviceCon,jdbcType=INTEGER}
	107	+ </if>
93	108	</where>
94	109	</sql>
95	110
96	111
97	112	<select id="queryHospitalDoctService" resultMap="HospitalDoctServiceResultMap"
98	113	parameterType="com.lyms.platform.permission.model.HospitalDoctServiceQuery">
99		- select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status
	114	+ select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon
100	115	from hospital_doct_service
101	116	<include refid="HospitalDoctServiceCondition"/>
102	117	<include refid="orderAndLimit"/>

...	...	@@ -239,6 +239,8 @@
239	239	result.setDoctId(hs.getDoctId());
240	240	result.setDoctPrice(hs.getDoctPrice());
241	241	result.setStatus(hs.getStatus());
	242	+ result.setDeviceCon(hs.getDeviceCon());
	243	+ result.setDevicePrice(hs.getDevicePrice());
242	244	if (StringUtils.isNum(hs.getDoctId())) {
243	245	result.setDoctName(docterMap.get(Integer.parseInt(hs.getDoctId())));
244	246	}
245	247
...	...	@@ -363,13 +365,16 @@
363	365	public BaseResponse addOrUpdateHosDoctService(HospitalDoctService hds, Integer id) {
364	366	BaseResponse baseResponse = new BaseResponse();
365	367	try {
366		- if (StringUtils.isNotEmpty(hds.getId())) {//修改
	368	+ //修改
	369	+ if (StringUtils.isNotEmpty(hds.getId())) {
367	370	HospitalDoctService oldHosDoct = hospitalDoctService.getHospitalDoctService(hds.getId());
368	371	//修改
369	372	if (oldHosDoct != null) {
370	373	oldHosDoct.setStatus(hds.getStatus());
371	374	oldHosDoct.setDoctPrice(hds.getDoctPrice());
372	375	oldHosDoct.setSyncStatus(0);
	376	+ oldHosDoct.setDeviceCon(hds.getDeviceCon());
	377	+ oldHosDoct.setDevicePrice(hds.getDevicePrice());
373	378	hospitalDoctService.updateHospitalDoctService(oldHosDoct);
374	379	}
375	380	} else {
...	...	@@ -382,6 +387,8 @@
382	387	hospitalDoctSer.setStatus(hds.getStatus());
383	388	hospitalDoctSer.setDoctPrice(hds.getDoctPrice());
384	389	hospitalDoctSer.setSyncStatus(0);
	390	+ hospitalDoctSer.setDeviceCon(hds.getDeviceCon());
	391	+ hospitalDoctSer.setDevicePrice(hds.getDevicePrice());
385	392	hospitalDoctService.updateHospitalDoctService(hospitalDoctSer);
386	393	} else {
387	394	hds.setId(UUID.randomUUID().toString().replace("-", ""));

...	...	@@ -47,6 +47,25 @@
47	47	*/
48	48	private Integer status;
49	49
	50	+ private BigDecimal devicePrice;
	51	+ private Integer deviceCon;//0 无 1全程
	52	+
	53	+ public BigDecimal getDevicePrice() {
	54	+ return devicePrice;
	55	+ }
	56	+
	57	+ public void setDevicePrice(BigDecimal devicePrice) {
	58	+ this.devicePrice = devicePrice;
	59	+ }
	60	+
	61	+ public Integer getDeviceCon() {
	62	+ return deviceCon;
	63	+ }
	64	+
	65	+ public void setDeviceCon(Integer deviceCon) {
	66	+ this.deviceCon = deviceCon;
	67	+ }
	68	+
50	69	public String getDoctName() {
51	70	return doctName;
52	71	}