jiangjiazhi / regional-platform

Commit ffc576eec1310b60771cc737783a2a7a4868820e

Authored by liquanyu almost 9 years ago

Exists in master and in 8 other branches

医院基础列表

Showing 5 changed files with 50 additions and 27 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
platform-biz-service/src/main/resources/mainOrm/Organization.xml
platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java

...	...	@@ -35,6 +35,15 @@
35	35	private Object street;
36	36	private String foreignId;
37	37	private Integer orgType; //-1 未设置 0 公司 1 医院
	38	+ private Integer status;
	39	+
	40	+ public Integer getStatus() {
	41	+ return status;
	42	+ }
	43	+
	44	+ public void setStatus(Integer status) {
	45	+ this.status = status;
	46	+ }
38	47
39	48	public Integer getOrgType() {
40	49	return orgType;

...	...	@@ -30,6 +30,15 @@
30	30	private List<String> provinceIds;
31	31	private List<Integer> typeList;
32	32	private List<Integer> idList;
	33	+ private Integer status;
	34	+
	35	+ public Integer getStatus() {
	36	+ return status;
	37	+ }
	38	+
	39	+ public void setStatus(Integer status) {
	40	+ this.status = status;
	41	+ }
33	42
34	43	public List<String> getProvinceIds() {
35	44	return provinceIds;

...	...	@@ -85,6 +85,9 @@
85	85	<if test="shortCode != null">
86	86	shortCode = #{shortCode,jdbcType=VARCHAR},
87	87	</if>
	88	+ <if test="status != null">
	89	+ status = #{status,jdbcType=INTEGER},
	90	+ </if>
88	91	</set>
89	92	where id = #{id,jdbcType=INTEGER}
90	93	</update>
...	...	@@ -188,6 +191,10 @@
188	191	<foreach collection="provinceIds" index="index" item="item" open="(" separator="," close=")">
189	192	#{item}
190	193	</foreach>
	194	+ </if>
	195	+
	196	+ <if test="status != null">
	197	+ and status = #{status,jdbcType=INTEGER}
191	198	</if>
192	199	</where>
193	200	</sql>

...	...	@@ -49,8 +49,6 @@
49	49
50	50	//高危配置
51	51	private String highConfig;
52		- //运行状态 0运行 1试运行 2停止
53		- private Integer status;
54	52
55	53	public String getHighConfig() {
56	54	return highConfig;
...	...	@@ -58,14 +56,6 @@
58	56
59	57	public void setHighConfig(String highConfig) {
60	58	this.highConfig = highConfig;
61		- }
62		-
63		- public Integer getStatus() {
64		- return status;
65		- }
66		-
67		- public void setStatus(Integer status) {
68		- this.status = status;
69	59	}
70	60
71	61	public String getHospitalId() {

...	...	@@ -381,7 +381,7 @@
381	381	String address = org.getAddress();
382	382	allAddress+=address;
383	383	hospital.put("address", allAddress);
384		-
	384	+ hospital.put("status",org.getStatus()+"");
385	385	hospital.put("remark", "");
386	386	}
387	387	SmsConfigQuery query = new SmsConfigQuery();
...	...	@@ -394,7 +394,7 @@
394	394	if (model != null)
395	395	{
396	396	hospital.put("highConfig",model.getHighConfig());
397		- hospital.put("status",model.getStatus()+"");
	397	+
398	398	}
399	399
400	400	}
...	...	@@ -424,7 +424,6 @@
424	424	if (model != null && StringUtils.isNotEmpty(model.getId()))
425	425	{
426	426	model.setHighConfig(highConfig);
427		- model.setStatus(status);
428	427	smsConfigService.updateSmsConfig(model, model.getId());
429	428	isExist = true;
430	429	}
431	430
...	...	@@ -436,9 +435,13 @@
436	435	model.setHospitalId(hid);
437	436	model.setYn(YnEnums.YES.getId());
438	437	model.setHighConfig(highConfig);
439		- model.setStatus(status);
440	438	smsConfigService.addSmsConfig(model);
441	439	}
	440	+ Organization obj = new Organization();
	441	+ obj.setId(Integer.parseInt(hid));
	442	+ obj.setStatus(status);
	443	+ organizationService.updateOrganization(obj);
	444	+
442	445	BaseResponse objectResponse = new BaseResponse();
443	446	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
444	447	objectResponse.setErrormsg("保存成功");
...	...	@@ -490,6 +493,7 @@
490	493	organizationQuery.setTypeList(typeList);
491	494	organizationQuery.setYn(YnEnums.YES.getId());
492	495	organizationQuery.setKeyword(hospitalName);
	496	+ organizationQuery.setStatus(status);
493	497
494	498	List<Map> hospitals = new ArrayList<>();
495	499
...	...	@@ -546,6 +550,22 @@
546	550
547	551	String sendTime = "";
548	552	String statusStr = "";
	553	+ if (org.getStatus() != null)
	554	+ {
	555	+ // 0运行 1试运行 2停止
	556	+ if (org.getStatus() == 0)
	557	+ {
	558	+ statusStr = "正式运行";
	559	+ }
	560	+ else if (org.getStatus() == 1)
	561	+ {
	562	+ statusStr = "试运行";
	563	+ }
	564	+ else if (org.getStatus() == 2) {
	565	+ statusStr = "停止运行";
	566	+ }
	567	+ }
	568	+
549	569	if (StringUtils.isNotEmpty(hid))
550	570	{
551	571	SmsConfigQuery queryConfig = new SmsConfigQuery();
...	...	@@ -576,19 +596,7 @@
576	596	}
577	597	}
578	598	}
579		- // 0运行 1试运行 2停止
580		- if (model.getStatus() == 0)
581		- {
582		- statusStr = "正式运行";
583		- }
584		- else if (model.getStatus() == 1)
585		- {
586		- statusStr = "试运行";
587		- }
588		- else if (model.getStatus() == 2)
589		- {
590		- statusStr = "停止运行";
591		- }
	599	+
592	600	}
593	601	}
594	602	}