From f30a977b18541d2f1b9a7863b1377e5f366df9dc Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 16 Nov 2020 18:01:41 +0800
Subject: [PATCH] 修改时间的bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 125 +++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 19 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..090a6ec 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,15 @@
package com.kidgrow.usercenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
+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.common.model.SysUser;
import com.kidgrow.usercenter.model.SysHospital;
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 +29,7 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
* @Description: 医院基础信息表
* @Project: 用户中心
* @CreateDate: Created in 2020-04-02 18:32:36 <br>
@@ -34,9 +40,11 @@
@RestController
@RequestMapping("/syshospital")
@Api(tags = "医院基础信息表")
-public class SysHospitalController extends BaseController{
+public class SysHospitalController extends BaseController {
@Autowired
private ISysHospitalService sysHospitalService;
+ @Autowired
+ private ISysOrganizationService organizationService;
/**
* 列表
@@ -48,12 +56,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);
}
+
/**
* 列表
*/
@@ -63,18 +72,30 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params, @LoginUser SysUser user) {
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
}
- return sysHospitalService.findHospitalList(params);
+ return sysHospitalService.findHospitalList(params, user);
}
+
@PostMapping("findAll")
@ApiOperation(value = "查询所有列表")
public ResultBody<SysHospital> findAll(@RequestBody Map<String, Object> params) {
+ if (params.get("hospitalName") != null) {
+ return sysHospitalService.findAll(params);
+ } else {
+ return ResultBody.ok().data(null);
+ }
+ }
+
+ @PostMapping("findAllByMap")
+ @ApiOperation(value = "查询所有列表")
+ public ResultBody<SysHospital> findAllByMap(@RequestBody Map<String, Object> params) {
return sysHospitalService.findAll(params);
}
+
/**
* 查询
*/
@@ -83,6 +104,19 @@
public ResultBody findById(@PathVariable Long id) {
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("");
+ }
}
/**
@@ -96,23 +130,63 @@
}
/**
+ * 修改医院logo
+ */
+ @ApiOperation(value = "保存")
+ @PostMapping("/updateLogo")
+ public ResultBody updateLogo(@RequestBody Map<String, Object> params) {
+ return sysHospitalService.updateLogo(params);
+ }
+
+ /**
* 新增or更新
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult) {
- List<String> errMsg= new ArrayList<>();
+ public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult, @LoginUser SysUser sysUser) {
+ 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);
+ if(!sysUser.getOrganizations().isEmpty()){
+ sysOrganization.setCreateUserOrgCode(sysUser.getOrganizations().get(1).getOrgCode());
+ }
+ } else {
+ sysOrganization.setOrgName(sysHospital.getHospitalName());
+ }
+ boolean org = organizationService.saveOrUpdateSer(sysOrganization);
+ sysHospital.setOrgId(sysOrganization.getId());
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if (organizations.size() > 0) {
+ sysHospital.setCreateUserOrgCode(organizations.get(organizations.size() - 1).getOrgCode());
+ }
+ //运营平台添加的医院默认就是正式的
+ if (sysHospital.getHospitalState()==null) {
+ sysHospital.setHospitalState(1);
+ }
+ boolean v = sysHospitalService.saveOrUpdate(sysHospital);
+ if (v) {
+ return ResultBody.ok().data(sysHospital).msg("保存成功");
+ } else {
return ResultBody.failed().msg("保存失败");
}
}
@@ -128,12 +202,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,10 +222,23 @@
@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);
}
+
+ /**
+ * 统计医院数量
+ * @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
+ * @return
+ */
+ @ApiOperation(value = "统计医院数量")
+ @GetMapping("/chartHospital")
+ public ResultBody chartHospital(int datatype) {
+ return sysHospitalService.chartHospital(datatype);
+ }
}
--
Gitblit v1.8.0