jiangjiazhi / regional-platform

Commit 0043e034ebb68b3c609d7786960d9428a5bec121

Authored by liquanyu about 6 years ago

Exists in master and in 6 other branches

服务

Showing 10 changed files with 94 additions and 66 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/java/com/lyms/platform/permission/model/HospitalServiceContent.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContentQuery.java
platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml
platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
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/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalServiceContentResult.java

...	...	@@ -36,8 +36,6 @@
36	36
37	37	private Integer syncStatus;
38	38
39		- private BigDecimal devicePrice;
40		- private Integer deviceCon;//0 无 1全程
41	39	private BigDecimal weekPrice;
42	40
43	41	public BigDecimal getWeekPrice() {
...	...	@@ -48,21 +46,6 @@
48	46	this.weekPrice = weekPrice;
49	47	}
50	48
51		- public BigDecimal getDevicePrice() {
52		- return devicePrice;
53		- }
54		-
55		- public void setDevicePrice(BigDecimal devicePrice) {
56		- this.devicePrice = devicePrice;
57		- }
58		-
59		- public Integer getDeviceCon() {
60		- return deviceCon;
61		- }
62		-
63		- public void setDeviceCon(Integer deviceCon) {
64		- this.deviceCon = deviceCon;
65		- }
66	49
67	50	public Integer getSyncStatus() {
68	51	return syncStatus;

...	...	@@ -36,8 +36,6 @@
36	36	private Integer status;
37	37	private Integer syncStatus;
38	38
39		- private BigDecimal devicePrice;
40		- private Integer deviceCon;//0 无 1全程
41	39	private BigDecimal weekPrice;
42	40
43	41	public BigDecimal getWeekPrice() {
44	42
...	...	@@ -48,21 +46,7 @@
48	46	this.weekPrice = weekPrice;
49	47	}
50	48
51		- public BigDecimal getDevicePrice() {
52		- return devicePrice;
53		- }
54	49
55		- public void setDevicePrice(BigDecimal devicePrice) {
56		- this.devicePrice = devicePrice;
57		- }
58		-
59		- public Integer getDeviceCon() {
60		- return deviceCon;
61		- }
62		-
63		- public void setDeviceCon(Integer deviceCon) {
64		- this.deviceCon = deviceCon;
65		- }
66	50
67	51	public Integer getSyncStatus() {
68	52	return syncStatus;

...	...	@@ -52,6 +52,26 @@
52	52	//单周服务价格
53	53	private BigDecimal weekPrice;
54	54
	55	+
	56	+ private BigDecimal devicePrice;
	57	+ private Integer deviceCon;//0 无 1全程
	58	+
	59	+ public BigDecimal getDevicePrice() {
	60	+ return devicePrice;
	61	+ }
	62	+
	63	+ public void setDevicePrice(BigDecimal devicePrice) {
	64	+ this.devicePrice = devicePrice;
	65	+ }
	66	+
	67	+ public Integer getDeviceCon() {
	68	+ return deviceCon;
	69	+ }
	70	+
	71	+ public void setDeviceCon(Integer deviceCon) {
	72	+ this.deviceCon = deviceCon;
	73	+ }
	74	+
55	75	public BigDecimal getWeekPrice() {
56	76	return weekPrice;
57	77	}

...	...	@@ -44,6 +44,25 @@
44	44	//单周服务价格
45	45	private BigDecimal weekPrice;
46	46
	47	+ private BigDecimal devicePrice;
	48	+ private Integer deviceCon;//0 无 1全程
	49	+
	50	+ public BigDecimal getDevicePrice() {
	51	+ return devicePrice;
	52	+ }
	53	+
	54	+ public void setDevicePrice(BigDecimal devicePrice) {
	55	+ this.devicePrice = devicePrice;
	56	+ }
	57	+
	58	+ public Integer getDeviceCon() {
	59	+ return deviceCon;
	60	+ }
	61	+
	62	+ public void setDeviceCon(Integer deviceCon) {
	63	+ this.deviceCon = deviceCon;
	64	+ }
	65	+
47	66	public BigDecimal getWeekPrice() {
48	67	return weekPrice;
49	68	}

...	...	@@ -8,8 +8,6 @@
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"/>
13	11	<result column="status" property="status" jdbcType="INTEGER"/>
14	12	<result column="sync_status" property="syncStatus" jdbcType="INTEGER"/>
15	13	<result column="weekPrice" property="weekPrice" jdbcType="DECIMAL"/>
...	...	@@ -17,8 +15,8 @@
17	15
18	16
19	17	<insert id="addHospitalDoctService" parameterType="com.lyms.platform.permission.model.HospitalDoctService">
20		-insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon,weekPrice) values
21		-(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice},#{deviceCon},#{weekPrice})
	18	+insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice) values
	19	+(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice})
22	20	</insert>
23	21
24	22
25	23
...	...	@@ -37,18 +35,14 @@
37	35	<if test="doctPrice != null">
38	36	doct_price = #{doctPrice,jdbcType=DECIMAL},
39	37	</if>
40		- <if test="devicePrice != null">
41		- devicePrice = #{devicePrice,jdbcType=DECIMAL},
42		- </if>
	38	+
43	39	<if test="weekPrice != null">
44	40	weekPrice = #{weekPrice,jdbcType=DECIMAL},
45	41	</if>
46	42	<if test="status != null and status >= 0">
47	43	status = #{status,jdbcType=INTEGER},
48	44	</if>
49		- <if test="deviceCon != null and deviceCon >= 0">
50		- deviceCon = #{deviceCon,jdbcType=INTEGER},
51		- </if>
	45	+
52	46	<if test="syncStatus != null and syncStatus >= 0">
53	47	sync_status = #{syncStatus,jdbcType=INTEGER},
54	48	</if>
...	...	@@ -63,7 +57,7 @@
63	57
64	58
65	59	<select id="getHospitalDoctService" resultMap="HospitalDoctServiceResultMap" parameterType="java.lang.String">
66		-select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status
	60	+select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,weekPrice
67	61	from hospital_doct_service where id = #{id,jdbcType=VARCHAR}
68	62	</select>
69	63
...	...	@@ -96,9 +90,7 @@
96	90	<if test="doctPrice != null">
97	91	and doct_price = #{doctPrice,jdbcType=DECIMAL}
98	92	</if>
99		- <if test="devicePrice != null">
100		- and devicePrice = #{devicePrice,jdbcType=DECIMAL}
101		- </if>
	93	+
102	94	<if test="weekPrice != null">
103	95	and weekPrice = #{weekPrice,jdbcType=DECIMAL}
104	96	</if>
105	97
...	...	@@ -109,16 +101,13 @@
109	101	and sync_status = #{syncStatus,jdbcType=INTEGER}
110	102	</if>
111	103
112		- <if test="deviceCon != null and deviceCon >= 0">
113		- and deviceCon = #{deviceCon,jdbcType=INTEGER}
114		- </if>
115	104	</where>
116	105	</sql>
117	106
118	107
119	108	<select id="queryHospitalDoctService" resultMap="HospitalDoctServiceResultMap"
120	109	parameterType="com.lyms.platform.permission.model.HospitalDoctServiceQuery">
121		- select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon,weekPrice
	110	+ select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,weekPrice
122	111	from hospital_doct_service
123	112	<include refid="HospitalDoctServiceCondition"/>
124	113	<include refid="orderAndLimit"/>

...	...	@@ -14,12 +14,14 @@
14	14	<result column="sync_status" property="syncStatus" jdbcType="INTEGER"/>
15	15
16	16	<result column="weekPrice" property="weekPrice" jdbcType="DECIMAL"/>
	17	+ <result column="devicePrice" property="devicePrice" jdbcType="DECIMAL"/>
	18	+ <result column="deviceCon" property="deviceCon" jdbcType="INTEGER"/>
17	19	</resultMap>
18	20
19	21
20	22	<insert id="addHospitalServiceContent" parameterType="com.lyms.platform.permission.model.HospitalServiceContent">
21		-insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice) values
22		-(#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser},#{status},#{syncStatus},#{weekPrice})
	23	+insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice,deviceCon,weekPrice) values
	24	+(#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser},#{status},#{syncStatus},#{weekPrice},#{deviceCon},#{weekPrice})
23	25	</insert>
24	26
25	27
...	...	@@ -38,6 +40,13 @@
38	40	<if test="weekPrice != null">
39	41	weekPrice = #{weekPrice,jdbcType=DECIMAL},
40	42	</if>
	43	+ <if test="deviceCon != null and deviceCon >= 0">
	44	+ deviceCon = #{deviceCon,jdbcType=INTEGER},
	45	+ </if>
	46	+ <if test="devicePrice != null">
	47	+ devicePrice = #{devicePrice,jdbcType=DECIMAL},
	48	+ </if>
	49	+
41	50	<if test="createDate != null">
42	51	create_date = #{createDate,jdbcType=TIMESTAMP},
43	52	</if>
...	...	@@ -94,6 +103,12 @@
94	103	<if test="weekPrice != null">
95	104	and weekPrice = #{weekPrice,jdbcType=DECIMAL}
96	105	</if>
	106	+ <if test="devicePrice != null">
	107	+ and devicePrice = #{devicePrice,jdbcType=DECIMAL}
	108	+ </if>
	109	+ <if test="deviceCon != null and deviceCon >= 0">
	110	+ and deviceCon = #{deviceCon,jdbcType=INTEGER}
	111	+ </if>
97	112	<if test="createDate != null">
98	113	and create_date = #{createDate,jdbcType=TIMESTAMP}
99	114	</if>
...	...	@@ -112,7 +127,7 @@
112	127
113	128	<select id="queryGroupHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
114	129	parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
115		- select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user,sync_status,weekPrice from hospital_service_content
	130	+ select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user,sync_status,weekPrice,devicePrice,deviceCon from hospital_service_content
116	131	<include refid="HospitalServiceContentCondition"/>
117	132	group by hospital_id
118	133	<include refid="orderAndLimit"/>
...	...	@@ -128,7 +143,7 @@
128	143
129	144	<select id="queryHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
130	145	parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
131		- select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice
	146	+ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice,devicePrice,deviceCon
132	147	from hospital_service_content
133	148	<include refid="HospitalServiceContentCondition"/>
134	149	<include refid="orderAndLimit"/>

...	...	@@ -22,7 +22,7 @@
22	22	xy(4, "血压管理"),
23	23	zjzx(5, "专家咨询"),
24	24	tw(7, "体温管理"),
25		- YFDC(8, "孕妇单次服务"),
	25	+ //YFDC(8, "孕妇单次服务"),
26	26	babyjzzz(10, "精准医疗指导"),
27	27	babyBzfw(11, "儿保小助理");//以前是：标准服务
28	28	private Integer id;

...	...	@@ -128,6 +128,9 @@
128	128	hospitalServiceContent.setStatus(ps.getStatus());
129	129	hospitalServiceContent.setSerPrice(ps.getSerPrice());
130	130	hospitalServiceContent.setWeekPrice(ps.getWeekPrice());
	131	+
	132	+ hospitalServiceContent.setDeviceCon(ps.getDeviceCon());
	133	+ hospitalServiceContent.setDevicePrice(ps.getDevicePrice());
131	134	hospitalServiceContentService.updateHospitalServiceContent(hospitalServiceContent);
132	135	} else {
133	136	ps.setId(UUID.randomUUID().toString().replace("-", ""));
...	...	@@ -240,8 +243,6 @@
240	243	result.setDoctId(hs.getDoctId());
241	244	result.setDoctPrice(hs.getDoctPrice());
242	245	result.setStatus(hs.getStatus());
243		- result.setDeviceCon(hs.getDeviceCon());
244		- result.setDevicePrice(hs.getDevicePrice());
245	246
246	247	result.setWeekPrice(hs.getWeekPrice());
247	248	if (StringUtils.isNum(hs.getDoctId())) {
...	...	@@ -321,6 +322,8 @@
321	322	result.setSerType(hs.getSerType());
322	323	result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
323	324	result.setWeekPrice(hs.getWeekPrice());
	325	+ result.setDeviceCon(hs.getDeviceCon());
	326	+ result.setDevicePrice(hs.getDevicePrice());
324	327	if (hs.getStatus() != null) {
325	328	result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
326	329	}
...	...	@@ -377,8 +380,6 @@
377	380	oldHosDoct.setStatus(hds.getStatus());
378	381	oldHosDoct.setDoctPrice(hds.getDoctPrice());
379	382	oldHosDoct.setSyncStatus(0);
380		- oldHosDoct.setDeviceCon(hds.getDeviceCon());
381		- oldHosDoct.setDevicePrice(hds.getDevicePrice());
382	383	oldHosDoct.setWeekPrice(hds.getWeekPrice());
383	384	hospitalDoctService.updateHospitalDoctService(oldHosDoct);
384	385	}
...	...	@@ -392,8 +393,6 @@
392	393	hospitalDoctSer.setStatus(hds.getStatus());
393	394	hospitalDoctSer.setDoctPrice(hds.getDoctPrice());
394	395	hospitalDoctSer.setSyncStatus(0);
395		- hospitalDoctSer.setDeviceCon(hds.getDeviceCon());
396		- hospitalDoctSer.setDevicePrice(hds.getDevicePrice());
397	396	hospitalDoctSer.setWeekPrice(hds.getWeekPrice());
398	397	hospitalDoctService.updateHospitalDoctService(hospitalDoctSer);
399	398	} else {

...	...	@@ -154,8 +154,7 @@
154	154	Map dmap = new HashMap();
155	155	dmap.put("doctorId", docId);
156	156	dmap.put("doctorPrice", hds.getDoctPrice());
157		- dmap.put("devicePrice", hds.getDevicePrice());
158		- dmap.put("deviceCon", hds.getDeviceCon());
	157	+
159	158	dmap.put("weekPrice", hds.getWeekPrice());
160	159	hsc.getDoctIds().add(dmap);
161	160	}
...	...	@@ -1149,6 +1148,8 @@
1149	1148	map.put("ser_type", serviceContent.getSerType());
1150	1149	map.put("status", serviceContent.getStatus());
1151	1150	map.put("weekPrice", serviceContent.getWeekPrice());
	1151	+ map.put("devicePrice", serviceContent.getDevicePrice());
	1152	+ map.put("deviceCon", serviceContent.getDeviceCon());
1152	1153	return map;
1153	1154	}
1154	1155
...	...	@@ -1160,8 +1161,7 @@
1160	1161	map.put("hosp_id", hospitalDoctService.getHospId());
1161	1162	map.put("hosp_service_id", hospitalDoctService.getHospServiceId());
1162	1163	map.put("status", hospitalDoctService.getStatus());
1163		- map.put("devicePrice", hospitalDoctService.getDevicePrice());
1164		- map.put("deviceCon", hospitalDoctService.getDeviceCon());
	1164	+
1165	1165	map.put("weekPrice", hospitalDoctService.getWeekPrice());
1166	1166	return map;
1167	1167	}

...	...	@@ -61,6 +61,25 @@
61	61	private BigDecimal weekPrice;
62	62
63	63
	64	+ private BigDecimal devicePrice;
	65	+ private Integer deviceCon;//0 无 1全程
	66	+
	67	+ public Integer getDeviceCon() {
	68	+ return deviceCon;
	69	+ }
	70	+
	71	+ public void setDeviceCon(Integer deviceCon) {
	72	+ this.deviceCon = deviceCon;
	73	+ }
	74	+
	75	+ public BigDecimal getDevicePrice() {
	76	+ return devicePrice;
	77	+ }
	78	+
	79	+ public void setDevicePrice(BigDecimal devicePrice) {
	80	+ this.devicePrice = devicePrice;
	81	+ }
	82	+
64	83	public BigDecimal getWeekPrice() {
65	84	return weekPrice;
66	85	}