From ec0f2528f83ee7c6ec64537d561a697ffff5b5c3 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Tue, 21 Apr 2020 15:27:04 +0800
Subject: [PATCH] 1.组织，医院，科室的编辑业务调整，增加了联动编辑功能（创建医院自动创建组织数据，修改同理） 2.重新优化，调整了医院/科室编辑过程中对名称的检查，数据间依赖关系的调整 3.调整优化了区域联动插件，自动完成插件的通用性
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index ef629d9..e518709 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -1,10 +1,14 @@
package com.kidgrow.usercenter.controller;
+import com.kidgrow.common.constant.DictionariesConstants;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.usercenter.model.SysHospital;
+import com.kidgrow.usercenter.service.ISysDepartmentService;
import com.kidgrow.usercenter.service.ISysHospitalService;
+import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.vo.HospitalListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -24,6 +28,7 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
* @Description: 医院基础信息表
* @Project: 用户中心
* @CreateDate: Created in 2020-04-02 18:32:36 <br>
@@ -34,9 +39,13 @@
@RestController
@RequestMapping("/syshospital")
@Api(tags = "医院基础信息表")
-public class SysHospitalController extends BaseController{
+public class SysHospitalController extends BaseController {
@Autowired
private ISysHospitalService sysHospitalService;
+ @Autowired
+ private ISysDepartmentService departmentService;
+ @Autowired
+ private ISysOrganizationService organizationService;
/**
* 列表
@@ -48,12 +57,13 @@
})
@GetMapping("/findOne")
public PageResult<SysHospital> listOne(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
}
return sysHospitalService.findList(params);
}
+
/**
* 列表
*/
@@ -64,17 +74,23 @@
})
@GetMapping
public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
}
return sysHospitalService.findHospitalList(params);
}
+
@PostMapping("findAll")
@ApiOperation(value = "查询所有列表")
public ResultBody<SysHospital> findAll(@RequestBody Map<String, Object> params) {
- return sysHospitalService.findAll(params);
+ if (params.get("hospitalName") != null) {
+ return sysHospitalService.findAll(params);
+ } else {
+ return ResultBody.ok().data(null);
+ }
}
+
/**
* 查询
*/
@@ -84,7 +100,18 @@
SysHospital model = sysHospitalService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
-
+ /**
+ * 查询
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/findByName")
+ public ResultBody findByName(@RequestParam String hospitalName) {
+ if (!hospitalName.isEmpty()) {
+ return ResultBody.ok().data(sysHospitalService.findByName(hospitalName).getData()).msg("查询成功");
+ } else {
+ return ResultBody.ok().data(null).msg("");
+ }
+ }
/**
* 根据SysHospital当做查询条件进行查询
*/
@@ -101,18 +128,41 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult) {
- List<String> errMsg= new ArrayList<>();
+ List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
errMsg.add(error.getDefaultMessage());
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- boolean v= sysHospitalService.saveOrUpdate(sysHospital);
- if(v) {
- return ResultBody.ok().data(sysHospital).msg("保存成功");
+ //先检查该医院是否存在组织信息
+ SysOrganization sysOrganization=new SysOrganization();
+ if(sysHospital.getOrgId()!=null){
+ sysOrganization.setId(sysHospital.getOrgId());}
+ else{
+ sysOrganization.setOrgName(sysHospital.getHospitalName());
+ sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
}
- else {
+ sysOrganization=organizationService.findByObject(sysOrganization);
+ if(sysOrganization==null)
+ {
+ //创建一个组织
+ sysOrganization=new SysOrganization();
+ sysOrganization.setOrgName(sysHospital.getHospitalName());
+ sysOrganization.setOrgAttr(1);
+ sysOrganization.setOrgLevel(1);
+ sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
+ }
+ else
+ {
+ sysOrganization.setOrgName(sysHospital.getHospitalName());
+ }
+ boolean org=organizationService.saveOrUpdate(sysOrganization);
+ sysHospital.setOrgId(sysOrganization.getId());
+ boolean v = sysHospitalService.saveOrUpdate(sysHospital);
+ if (v) {
+ return ResultBody.ok().data(sysHospital).msg("保存成功");
+ } else {
return ResultBody.failed().msg("保存失败");
}
}
@@ -128,12 +178,12 @@
@ApiImplicitParam(name = "departmentId", value = "departmentId", required = true, dataType = "Integer")
})
public ResultBody delete(@RequestParam Map<String, Object> params) {
- if (params.size()==0)
- {
+ if (params.size() == 0) {
return ResultBody.failed().msg("参数异常！");
}
return sysHospitalService.delete(params);
}
+
/**
* 修改状态
*
@@ -148,8 +198,7 @@
@ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
})
public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
- if (params.size()==0)
- {
+ if (params.size() == 0) {
return ResultBody.failed().msg("参数异常！");
}
return sysHospitalService.updateEnabled(params);
--
Gitblit v1.8.0