changpengfei / talkonline

Commit 5493c2095516a212b6b6d72914077b795e566f83

Authored by shiyang over 3 years ago

Exists in master

PC-查询同一家医院科室名称是否重复（修改）

PC-查询同vtype类型，字典编码是否重复（修改）

Showing 2 changed files with 26 additions and 12 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java

...	...	@@ -200,14 +200,22 @@
200	200	* @return true 可以使用，false已经存在
201	201	*/
202	202	@GetMapping("getDepartByParam")
203		- public BaseResponse getDepartByParam(Integer hid,String dname){
	203	+ public BaseResponse getDepartByParam(Integer hid,String dname,@RequestParam(required = false) Integer did){
204	204	BaseResponse baseResponse=new BaseResponse();
205	205	try {
206	206	QueryWrapper<LymsHdepart> queryWrapper=new QueryWrapper<>();
207	207	queryWrapper.eq("hid", hid);
208	208	queryWrapper.eq("dname", dname);
209		- LymsHdepart lymsHdepart=lymsHdepartService.getOne(queryWrapper);
210		- baseResponse.setObject(null==lymsHdepart?true:false);
	209	+ if(null!=did){//修改的时候判断是否重复
	210	+ QueryWrapper<LymsHdepart> queryWrapper2=new QueryWrapper<>();
	211	+ queryWrapper2.eq("did", did);
	212	+ LymsHdepart lymsHdepart2=lymsHdepartService.getOne(queryWrapper2);
	213	+ LymsHdepart lymsHdepart=lymsHdepartService.getOne(queryWrapper);
	214	+ baseResponse.setObject(null==lymsHdepart?true:(lymsHdepart2.getDname().equals(dname)?true:false));
	215	+ }else {
	216	+ LymsHdepart lymsHdepart=lymsHdepartService.getOne(queryWrapper);
	217	+ baseResponse.setObject(null==lymsHdepart?true:false);
	218	+ }
211	219	baseResponse.setErrormsg("成功");
212	220	} catch (Exception e) {
213	221	baseResponse.setErrormsg("失败");

...	...	@@ -11,10 +11,7 @@
11	11	import com.lyms.talkonlineweb.service.LymsDictService;
12	12	import com.lyms.talkonlineweb.service.RegionsService;
13	13	import org.springframework.beans.factory.annotation.Autowired;
14		-import org.springframework.web.bind.annotation.GetMapping;
15		-import org.springframework.web.bind.annotation.PostMapping;
16		-import org.springframework.web.bind.annotation.RequestBody;
17		-import org.springframework.web.bind.annotation.RestController;
	14	+import org.springframework.web.bind.annotation.*;
18	15
19	16	import java.util.List;
20	17
21	18
22	19
23	20
...	...	@@ -95,20 +92,29 @@
95	92	}
96	93
97	94	/**
98		- * PC-查询同vtype类型字code典编码是否重复
	95	+ * PC-查询同vtype类型，字典编码是否重复
99	96	* @param vtype 所属类型
100	97	* @param code 编码
	98	+ * @param value 取值
101	99	* @return true 可以使用，false已经存在
102	100	*/
103	101	@GetMapping("getDictByParam")
104		- public BaseResponse getDictByParam(Integer vtype,Integer code){
	102	+ public BaseResponse getDictByParam(Integer vtype, Integer code,String value, @RequestParam(required = false) Integer id){
105	103	BaseResponse baseResponse=new BaseResponse();
106	104	try {
107	105	QueryWrapper<LymsDict> queryWrapper=new QueryWrapper<>();
108	106	queryWrapper.eq("vtype", vtype);
109		- queryWrapper.eq("code", code);
110		- LymsDict dict=lymsDictService.getOne(queryWrapper);
111		- baseResponse.setObject(null==dict?true:false);
	107	+ queryWrapper.eq("code", code).or().eq("value",value );
	108	+ if(null!=id){//修改的时候判断是否重复
	109	+ QueryWrapper<LymsDict> queryWrapper2=new QueryWrapper<>();
	110	+ queryWrapper2.eq("id", id);
	111	+ LymsDict dict2=lymsDictService.getOne(queryWrapper2);
	112	+ LymsDict dict=lymsDictService.getOne(queryWrapper);
	113	+ baseResponse.setObject(null==dict?true:(dict2.getCode().equals(code)&&dict2.getValue().equals(value)?true:false));
	114	+ }else {
	115	+ LymsDict dict=lymsDictService.getOne(queryWrapper);
	116	+ baseResponse.setObject(null==dict?true:false);
	117	+ }
112	118	baseResponse.setErrormsg("成功");
113	119	} catch (Exception e) {
114	120	baseResponse.setErrormsg("失败");