Merge remote-tracking branch 'origin/dev' into dev

common/common-entity/sql/2023.sql

@@ -243,4 +243,11 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000007', NULL, 'PROFESSIONAL_STATE', '6', '军人', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000008', NULL, 'PROFESSIONAL_STATE', '7', '不便分类的其他从业人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
===========================20231024上门服务结束====================================
===========================20231024上门服务结束====================================
ALTER TABLE `base`.`base_service_package`
    MODIFY COLUMN `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL FIRST;
ALTER TABLE `base`.`base_service_package_item`
    MODIFY COLUMN `service_package_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'system' COMMENT '服务包id' AFTER `name`,
    MODIFY COLUMN `service_package_item_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建服务项的id。也是本表的id。system那些数据' AFTER `service_package_id`;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/MenuEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.base.endpoint.role;
import com.alibaba.fastjson.JSON;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.base.service.role.MenuService;
import com.yihu.jw.base.service.role.RoleMenuService;
@@ -45,18 +46,18 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.Menu.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<MenuVO> create (
    public ObjEnvelop<MenuVO> create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        try {
            MenuDO menuDO = toEntity(jsonData, MenuDO.class);
            int count = menuService.isExistName(menuDO.getName());
            if(count>0){
            if (count > 0) {
                return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Menu.NAME_IS_EXIST), ObjEnvelop.class);
            }
            menuDO = menuService.addMenu(menuDO);
            return success(menuDO, MenuVO.class);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("操作失败");
        }
@@ -70,7 +71,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
        try {
            menuService.moveDown(id);
            return success("修改成功");
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作失败");
        }
@@ -84,7 +85,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
        try {
            menuService.moveUp(id);
            return success("修改成功");
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作失败");
        }
@@ -100,20 +101,20 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
        try {
            menuService.updateStatus(id, status);
            return success("修改成功");
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作失败");
        }
    }
    @GetMapping(value = BaseRequestMapping.Menu.IS_NAME_EXIST)
    @ApiOperation(value = "名称是否存在",notes = "返回值中的obj=1表示名称已经存在，0表示名称不存在")
    @ApiOperation(value = "名称是否存在", notes = "返回值中的obj=1表示名称已经存在，0表示名称不存在")
    public ObjEnvelop isNameExist(
            @ApiParam(name = "name", value = "菜单名称", required = true)
            @RequestParam(value = "name") String name) {
        try {
            return success(menuService.isExistName(name));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("操作失败");
        }
@@ -121,21 +122,21 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.Menu.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
    public Envelop update(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData){
            @RequestParam String jsonData) {
        try {
            MenuDO menuDO = toEntity(jsonData, MenuDO.class);
            if (null == menuDO.getId()) {
                return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Common.ID_IS_NULL), Envelop.class);
            }
            int count = menuService.isExistName(menuDO.getName());
            if(count>1){
            if (count > 1) {
                return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Menu.NAME_IS_EXIST), ObjEnvelop.class);
            }
            menuDO = menuService.updateMenu(menuDO);
            return success(menuDO);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作失败");
        }
@@ -143,7 +144,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Menu.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<MenuVO> page (
    public PageEnvelop<MenuVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -153,12 +154,12 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size){
            @RequestParam(value = "size") int size) {
        try {
            List<MenuDO> menuDOS = menuService.search(fields, filters, sorts, page, size);
            int count = (int)menuService.getCount(filters);
            int count = (int) menuService.getCount(filters);
            return success(menuDOS, count, page, size, MenuVO.class);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return PageEnvelop.getError("获取失败");
        }
@@ -166,25 +167,25 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Menu.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MenuVO> list (
    public ListEnvelop<MenuVO> list(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = false) String id){
            @RequestParam(value = "id", required = false) String id) {
        try {
            String filters = "";
            if(StringUtils.isNotBlank(id)){
                filters = "parentId="+id+";";
            if (StringUtils.isNotBlank(id)) {
                filters = "parentId=" + id + ";";
            }
            List<MenuDO> menuDOS = menuService.search(null, filters, "+sort");
            MenuDO menuDO = menuService.findOne(id);
            menuDOS.forEach(menu -> {
                if(CommonContant.DEFAULT_PARENTID.equals(menu.getParentId())){
                if (CommonContant.DEFAULT_PARENTID.equals(menu.getParentId())) {
                    menu.setParentName(CommonContant.DEFAULT_PARENTNAME);
                }else {
                } else {
                    menu.setParentName(menuDO.getName());
                }
            });
            return success(menuDOS, MenuVO.class);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
        }
@@ -192,42 +193,42 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Menu.FIND_ALL)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MenuVO> findAll (
    public ListEnvelop<MenuVO> findAll(
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "name", value = "名称")
            @RequestParam(value = "name", required = false) String name){
            @RequestParam(value = "name", required = false) String name) {
        try {
            String filters = "";
            if(StringUtils.isNotBlank(status)){
                filters = "status="+status+";";
            if (StringUtils.isNotBlank(status)) {
                filters = "status=" + status + ";";
            }
            if(StringUtils.isNotBlank(name)){
                filters += "name?"+name+";";
            if (StringUtils.isNotBlank(name)) {
                filters += "name?" + name + ";";
            }
            List<MenuDO> menuDOs = menuService.search(null, filters, "+sort");
            List<MenuVO> menuVOs = convertToModels(menuDOs,new ArrayList<>(menuDOs.size()), MenuVO.class);
            List<MenuVO> menuVOs = convertToModels(menuDOs, new ArrayList<>(menuDOs.size()), MenuVO.class);
            menuVOs.forEach(menuVO -> {
                if(CommonContant.DEFAULT_PARENTID.equals(menuVO.getParentId())){
                if (CommonContant.DEFAULT_PARENTID.equals(menuVO.getParentId())) {
                    menuVO.setParentName(CommonContant.DEFAULT_PARENTNAME);
                }else {
                } else {
                    MenuDO menuDO = menuService.findOne(menuVO.getParentId());
                    menuVO.setParentName(menuDO.getName());
                }
            });
            Map<String,List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            Map<String, List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            menuVOs.forEach(menu->{
            menuVOs.forEach(menu -> {
                List<MenuVO> tmp = map.get(menu.getId());
                menu.setChildren(tmp);
            });
            if(StringUtils.isBlank(name)){
            if (StringUtils.isBlank(name)) {
                menuVOs = menuVOs.stream()
                        .filter(menu -> CommonContant.DEFAULT_PARENTID.equals(menu.getParentId()))
                        .collect(Collectors.toList());
            }
            return success(menuVOs);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
        }
@@ -235,18 +236,18 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Menu.GET_TREE)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MenuVO> getTree (
    public ListEnvelop<MenuVO> getTree(
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status) {
        try {
            String filters = null;
            if(StringUtils.isNotBlank(status)){
                filters = "status="+status;
            if (StringUtils.isNotBlank(status)) {
                filters = "status=" + status;
            }
            List<MenuDO> menuDOs = menuService.search(null, filters, null);
            List<MenuVO> menuVOs = convertToModels(menuDOs,new ArrayList<>(menuDOs.size()),MenuVO.class);
            Map<String,List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            menuVOs.forEach(menu->{
            List<MenuVO> menuVOs = convertToModels(menuDOs, new ArrayList<>(menuDOs.size()), MenuVO.class);
            Map<String, List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            menuVOs.forEach(menu -> {
                List<MenuVO> tmp = map.get(menu.getId());
                menu.setChildren(tmp);
            });
@@ -255,7 +256,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
                    .collect(Collectors.toList());
            return success(menuVOs);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
        }
@@ -264,20 +265,20 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Menu.findRoleMenuTree)
    @ApiOperation(value = "获取角色菜单列表")
    public ListEnvelop<MenuVO> findRoleMenuTree (
    public ListEnvelop<MenuVO> findRoleMenuTree(
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "name", value = "名称")
            @RequestParam(value = "name", required = false) String name,
            @ApiParam(name = "roleId", value = "角色id")
            @RequestParam(value = "roleId", required = false)String roleId){
            @RequestParam(value = "roleId", required = false) String roleId) {
        try {
            String filters = "";
            if(StringUtils.isNotBlank(status)){
                filters = "status="+status+";";
            if (StringUtils.isNotBlank(status)) {
                filters = "status=" + status + ";";
            }
            if(StringUtils.isNotBlank(name)){
                filters += "name?"+name+";";
            if (StringUtils.isNotBlank(name)) {
                filters += "name?" + name + ";";
            }
@@ -285,35 +286,35 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            List<RoleMenuDO> roleMenus = roleMenuService.findRoleMenu(roleId);
            List<MenuDO> menuDOs = menuService.search(null, filters, "+sort");
            List<MenuVO> menuVOs = convertToModels(menuDOs,new ArrayList<>(menuDOs.size()), MenuVO.class);
            List<MenuVO> menuVOs = convertToModels(menuDOs, new ArrayList<>(menuDOs.size()), MenuVO.class);
            menuVOs.forEach(menuVO -> {
                if(CommonContant.DEFAULT_PARENTID.equals(menuVO.getParentId())){
                if (CommonContant.DEFAULT_PARENTID.equals(menuVO.getParentId())) {
                    menuVO.setParentName(CommonContant.DEFAULT_PARENTNAME);
                }else {
                } else {
                    MenuDO menuDO = menuService.findOne(menuVO.getParentId());
                    menuVO.setParentName(menuDO.getName());
                }
                //对比树是否被选择
                if(checkedTree(menuVO.getId(),roleMenus)){
                if (checkedTree(menuVO.getId(), roleMenus)) {
                    menuVO.setChecked(true);
                }else{
                } else {
                    menuVO.setChecked(false);
                }
            });
            Map<String,List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            Map<String, List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            menuVOs.forEach(menu->{
            menuVOs.forEach(menu -> {
                List<MenuVO> tmp = map.get(menu.getId());
                menu.setChildren(tmp);
            });
            if(StringUtils.isBlank(name)){
            if (StringUtils.isBlank(name)) {
                menuVOs = menuVOs.stream()
                        .filter(menu -> CommonContant.DEFAULT_PARENTID.equals(menu.getParentId()))
                        .collect(Collectors.toList());
            }
            return success(menuVOs);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
        }
@@ -321,15 +322,16 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    /**
     * 验证树是否被选择
     *
     * @param menuId
     * @param roleMenus
     * @return
     */
    public Boolean checkedTree(String menuId,List<RoleMenuDO> roleMenus){
    public Boolean checkedTree(String menuId, List<RoleMenuDO> roleMenus) {
        if(roleMenus!=null&&roleMenus.size()>0){
            for(RoleMenuDO roleMenuDO:roleMenus){
                if(menuId.equals(roleMenuDO.getMenuId())){
        if (roleMenus != null && roleMenus.size() > 0) {
            for (RoleMenuDO roleMenuDO : roleMenus) {
                if (menuId.equals(roleMenuDO.getMenuId())) {
                    return true;
                }
            }
@@ -339,32 +341,33 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Menu.findLoginRoleMenuTree)
    @ApiOperation(value = "获取角色登录菜单")
    public ListEnvelop<MenuVO> findLoginRoleMenuTree (
    public ListEnvelop<MenuVO> findLoginRoleMenuTree(
            @ApiParam(name = "roleId", value = "角色id")
            @RequestParam(value = "roleId", required = false)String roleId){
            @RequestParam(value = "roleId", required = false) String roleId) {
        try {
            System.out.println("获取角色登录菜单==>参数：" + roleId);
            List<MenuVO> menuVOs = roleMenuService.findMenuByRoleId(roleId);
            menuVOs.forEach(menuVO -> {
                if(CommonContant.DEFAULT_PARENTID.equals(menuVO.getParentId())){
                if (CommonContant.DEFAULT_PARENTID.equals(menuVO.getParentId())) {
                    menuVO.setParentName(CommonContant.DEFAULT_PARENTNAME);
                }else {
                } else {
                    MenuDO menuDO = menuService.findOne(menuVO.getParentId());
                    menuVO.setParentName(menuDO.getName());
                }
            });
            Map<String,List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            Map<String, List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
            menuVOs.forEach(menu->{
            menuVOs.forEach(menu -> {
                List<MenuVO> tmp = map.get(menu.getId());
                menu.setChildren(tmp);
            });
            menuVOs = menuVOs.stream()
                    .filter(menu -> CommonContant.DEFAULT_PARENTID.equals(menu.getParentId()))
                    .collect(Collectors.toList());
            System.out.println("结果==>" + JSON.toJSONString(menuVOs));
            return success(menuVOs);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
        }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -11,13 +11,11 @@ import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -40,16 +38,16 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.User.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create (
    public Envelop create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData){
            @RequestParam String jsonData) {
        try {
            JSONObject jsonObject =  userService.createUser(jsonData);
            JSONObject jsonObject = userService.createUser(jsonData);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.getString("msg"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -63,7 +61,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
        try {
            userService.delete(ids.split(","));
            return success("删除成功");
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -71,16 +69,16 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.User.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
                @ApiParam(name = "jsonData", value = "Json数据")
                @RequestParam(value = "jsonData", required = false) String jsonData) {
    public Envelop update(
            @ApiParam(name = "jsonData", value = "Json数据")
            @RequestParam(value = "jsonData", required = false) String jsonData) {
        try {
            JSONObject jsonObject =  userService.updateUser(jsonData);
            JSONObject jsonObject = userService.updateUser(jsonData);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.getString("msg"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -88,7 +86,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.User.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<UserVO> page (
    public PageEnvelop<UserVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -98,12 +96,12 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size){
            @RequestParam(value = "size") int size) {
        try {
            List<UserDO> userDOS = userService.search(fields, filters, sorts, page, size);
            int count = (int)userService.getCount(filters);
            int count = (int) userService.getCount(filters);
            return success(userDOS, count, page, size, UserVO.class);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return PageEnvelop.getError("操作错误");
        }
@@ -111,7 +109,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.User.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<UserVO> list (
    public ListEnvelop<UserVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -121,7 +119,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
        try {
            List<UserDO> userDOS = userService.search(fields, filters, sorts);
            return success(userDOS, UserVO.class);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("操作错误");
        }
@@ -129,16 +127,16 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.User.CHECK_USERNAME)
    @ApiOperation(value = "检查用户名是否可用(message=available代表可用，message=inavailable代表不可用)")
    public Envelop checkName (
    public Envelop checkName(
            @ApiParam(name = "username", value = "用户名", required = true)
            @RequestParam(value = "username", required = false) String username){
            @RequestParam(value = "username", required = false) String username) {
        try {
            if (userService.existUsername(username)) {
                return success("inavailable");
            } else {
                return success("available");
            }
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -146,9 +144,9 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.User.CHECK_MOBILE)
    @ApiOperation(value = "检查手机号是否可用(message=available代表可用，message=inavailable代表不可用)")
    public Envelop checkMobile (
    public Envelop checkMobile(
            @ApiParam(name = "mobile", value = "手机号", required = true)
            @RequestParam(value = "mobile", required = false) String mobile){
            @RequestParam(value = "mobile", required = false) String mobile) {
        try {
            if (userService.existMobile(mobile)) {
@@ -156,7 +154,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            } else {
                return success("available");
            }
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -164,11 +162,12 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.User.findUserBaseInfo)
    @ApiOperation(value = "获取登录基本信息")
    public ObjEnvelop<Map<String,Object>> findUserBaseInfo(@ApiParam(name = "id", value = "用户id", required = true)
                                                               @RequestParam(value = "id", required = false)String id){
    public ObjEnvelop<Map<String, Object>> findUserBaseInfo(@ApiParam(name = "id", value = "用户id", required = true)
                                                            @RequestParam(value = "id", required = false) String id) {
        try {
            return success(BaseRequestMapping.User.api_success,userService.findUserBaseInfo(id));
        }catch (Exception e){
            System.out.println("获取登录基本信息==>参数：" + id);
            return success(BaseRequestMapping.User.api_success, userService.findUserBaseInfo(id));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("操作错误");
        }
@@ -185,14 +184,14 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取单个用户信息")
    public Envelop doctorHosplist(
            @ApiParam(name = "id", value = "获取单个用户信息")
            @RequestParam(value = "id", required = true) String id){
            @RequestParam(value = "id", required = true) String id) {
        try {
            JSONObject jsonObject = userService.getOneUserInfo(id);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.getJSONObject("msg"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -213,14 +212,14 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "userId", value = "userId")
            @RequestParam(value = "userId", required = false) String userId,
            @ApiParam(name = "roleId", value = "roleId")
            @RequestParam(value = "roleId", required = false) String roleId){
            @RequestParam(value = "roleId", required = false) String roleId) {
        try {
            JSONObject jsonObject = userService.generateUserOrgTree(saasid,userId,roleId);
            JSONObject jsonObject = userService.generateUserOrgTree(saasid, userId, roleId);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.get("msg"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -229,6 +228,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    /**
     * 获取用户管理机构树 省/市/区/机构 树形结构数据
     * 新增社区树
     *
     * @param saasid
     * @return
     * @throws Exception
@@ -241,14 +241,14 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "userId", value = "userId")
            @RequestParam(value = "userId", required = false) String userId,
            @ApiParam(name = "roleId", value = "roleId")
            @RequestParam(value = "roleId", required = false) String roleId){
            @RequestParam(value = "roleId", required = false) String roleId) {
        try {
            JSONObject jsonObject = userService.orgChoiceInfo(saasid,userId,roleId);
            JSONObject jsonObject = userService.orgChoiceInfo(saasid, userId, roleId);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.get("msg"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -273,11 +273,11 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size){
            @RequestParam(value = "size") int size) {
        try {
            JSONObject result = userService.userInfoList(realName,saasid, roleId,page,size,wechatId);
            return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
        }catch (Exception e){
            JSONObject result = userService.userInfoList(realName, saasid, roleId, page, size, wechatId);
            return success(result.getJSONArray("msg"), result.getInteger("count"), page, size);
        } catch (Exception e) {
            e.printStackTrace();
            return PageEnvelop.getError("操作错误");
        }
@@ -297,14 +297,14 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "id", value = "用户标识")
            @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "status", value = "生效或失效标识")
            @RequestParam(value = "status", required = true) boolean status){
            @RequestParam(value = "status", required = true) boolean status) {
        try {
            JSONObject jsonObject =  userService.lockOrUnlocakUser(id, status);
            JSONObject jsonObject = userService.lockOrUnlocakUser(id, status);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.getString("response"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -318,12 +318,12 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "status", value = "生效或失效标识")
            @RequestParam(value = "status", required = true) boolean status) {
        try {
            JSONObject jsonObject =  userService.enableOrDisable(id, status);
            JSONObject jsonObject = userService.enableOrDisable(id, status);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.getString("response"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
@@ -341,30 +341,30 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "重置密码")
    public Envelop resetPwd(
            @ApiParam(name = "id", value = "用户标识")
            @RequestParam(value = "id", required = true) String id){
            @RequestParam(value = "id", required = true) String id) {
        try {
            JSONObject jsonObject =  userService.resetPassword(id);
            JSONObject jsonObject = userService.resetPassword(id);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.getString("msg"));
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }
    }
    
    @PostMapping(value = BaseRequestMapping.User.updatePwd)
    @ApiOperation(value = "修账号密码")
    public Envelop updatePwd(@ApiParam(name = "id", value = "用户ID")
                                  @RequestParam(value = "id", required = true)String id,
                                  @ApiParam(name = "pw", value = "密码")
                                  @RequestParam(value = "pw", required = true)String pw,
                                  @ApiParam(name = "orgPw", value = "原密码")
                                  @RequestParam(value = "orgPw", required = true)String orgPw){
                             @RequestParam(value = "id", required = true) String id,
                             @ApiParam(name = "pw", value = "密码")
                             @RequestParam(value = "pw", required = true) String pw,
                             @ApiParam(name = "orgPw", value = "原密码")
                             @RequestParam(value = "orgPw", required = true) String orgPw) {
        try {
            return success(userService.updatePwd(id,pw,orgPw));
        }catch (Exception e){
            return success(userService.updatePwd(id, pw, orgPw));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作错误");
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageService.java

@@ -36,7 +36,6 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
 *
 * @author yeshijie on 2018/8/17.
 */
@Service
@@ -65,55 +64,56 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    private ServicePackageSignRecordDao servicePackageSignRecordDao;
    @Transactional(rollbackFor = Exception.class)
    public JSONObject create(ServicePackageDO servicePackageDO,String uid){
    public JSONObject create(ServicePackageDO servicePackageDO, String uid) {
        JSONObject result = new JSONObject();
        UserDO userDO = userDao.findById(uid);
        List<ServicePackageItemDO> itemDOList = servicePackageDO.getPackageItemDOList();
        if(itemDOList==null){
        if (itemDOList == null) {
            servicePackageDO.setNum(0);
        }else {
        } else {
            servicePackageDO.setNum(itemDOList.size());
        }
        if(StringUtil.isEmpty(servicePackageDO.getId())){
        if (StringUtil.isEmpty(servicePackageDO.getId())) {
            //新增
            servicePackageDO.setCreateTime(new Date());
            if(userDO!=null){
            if (userDO != null) {
                servicePackageDO.setCreateUser(userDO.getId());
                servicePackageDO.setCreateUserName(userDO.getName());
            }
            servicePackageDO=servicePackageDao.save(servicePackageDO);
        }else{
            servicePackageDO = servicePackageDao.save(servicePackageDO);
        } else {
            //修改
            servicePackageDO.setUpdateTime(new Date());
            if(userDO!=null){
            if (userDO != null) {
                servicePackageDO.setUpdateUser(userDO.getId());
                servicePackageDO.setUpdateUserName(userDO.getName());
            }
            servicePackageDO= servicePackageDao.save(servicePackageDO);
            servicePackageDO = servicePackageDao.save(servicePackageDO);
        }
        List<ServiceItemConfig> itemConfigList = new ArrayList<>();
        String sql = " SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'plan_frequency' limit 1";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        String frequencyCode = "0 0 10 ? * *";
        if(list.size()>0){
            frequencyCode = list.get(0).get("dict_code")+"";
        if (list.size() > 0) {
            frequencyCode = list.get(0).get("dict_code") + "";
        }
        for (ServicePackageItemDO itemDO:itemDOList){
        for (ServicePackageItemDO itemDO : itemDOList) {
            boolean flag = false;
            ServicePackageItemDO itemDO1 = new ServicePackageItemDO();
            if(StringUtils.isNotBlank(itemDO.getId())){
            if (StringUtils.isNotBlank(itemDO.getId())) {
                itemDO1 = servicePackageItemDao.findOne(itemDO.getId());
            }
            if("system".equals(itemDO1.getServicePackageId())){
            if ("system".equals(itemDO1.getServicePackageId())) {
                flag = true;
                BeanUtils.copyProperties(itemDO1,itemDO);
                BeanUtils.copyProperties(itemDO1, itemDO);
                itemDO.setId(null);
                itemDO.setCreateTime(DateUtil.getStringDate());
                itemDO.setServicePackageItemId(itemDO1.getId());//20231110补的
                itemDO.setServicePackageId(servicePackageDO.getId());
            }
            servicePackageItemDao.save(itemDO);
            if(flag){
            if (flag) {
                String itemId = itemDO.getId();
                //新增的服务项新增默认执行计划
                ServiceItemConfig itemConfig = new ServiceItemConfig();
@@ -131,12 +131,12 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            }
        }
        if(itemConfigList.size()>0){
        if (itemConfigList.size() > 0) {
            itemConfigDao.save(itemConfigList);
        }
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg","操作成功");
        result.put("msg", "操作成功");
        return result;
    }
@@ -166,29 +166,29 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        String pageSql = " limit " + (page - 1) * size + "," + size;
        detailSql += sql + pageSql;
        countSql += sql;
        List<ServicePackageDO> list = jdbcTemplate.query(detailSql,new BeanPropertyRowMapper<>(ServicePackageDO.class));
        List<ServicePackageDO> list = jdbcTemplate.query(detailSql, new BeanPropertyRowMapper<>(ServicePackageDO.class));
        List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOS = wlyyHospitalSysDictDao.findByDictName("serviceType");
        List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOS1 = wlyyHospitalSysDictDao.findByDictName("isEffect");
        for (ServicePackageDO servicePackageDO:list){
        for (ServicePackageDO servicePackageDO : list) {
            List<ServicePackageItemDO> itemDOList = servicePackageItemDao.findByServicePackageId(servicePackageDO.getId());
            List<String> orgNames = itemDOList.stream().map(p -> p.getOrgName()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
            List<String> orgCodes = itemDOList.stream().map(p -> p.getOrgCode()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
            servicePackageDO.setOrgNames(StringUtils.join(orgNames,","));
            servicePackageDO.setOrgCodes(StringUtils.join(orgCodes,","));
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:wlyyHospitalSysDictDOS){
                if (servicePackageDO.getType().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
            servicePackageDO.setOrgNames(StringUtils.join(orgNames, ","));
            servicePackageDO.setOrgCodes(StringUtils.join(orgCodes, ","));
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO : wlyyHospitalSysDictDOS) {
                if (servicePackageDO.getType().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())) {
                    servicePackageDO.setTypeName(wlyyHospitalSysDictDO.getDictValue());
                }
            }
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:wlyyHospitalSysDictDOS1){
                if (servicePackageDO.getDel().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO : wlyyHospitalSysDictDOS1) {
                if (servicePackageDO.getDel().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())) {
                    servicePackageDO.setDelName(wlyyHospitalSysDictDO.getDictValue());
                }
            }
        }
        Long count = jdbcTemplate.queryForObject(countSql, Long.class);
        return PageEnvelop.getSuccessListWithPage("获取成功",list,page,size,count);
        return PageEnvelop.getSuccessListWithPage("获取成功", list, page, size, count);
    }
    public void deleteById(String id) {
@@ -209,11 +209,11 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        jdbcTemplate.execute(sql01);
    }
    public void changeState(String id,String del,String uid) {
    public void changeState(String id, String del, String uid) {
        ServicePackageDO packageDO = servicePackageDao.findOne(id);
        packageDO.setDel(del);
        UserDO userDO = userDao.findById(uid);
        if(userDO!=null){
        if (userDO != null) {
            packageDO.setUpdateUser(userDO.getId());
            packageDO.setUpdateUserName(userDO.getName());
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -12,7 +12,6 @@ import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.base.service.org.BaseOrgUserService;
import com.yihu.jw.base.service.org.OrgTree;
import com.yihu.jw.base.service.org.OrgTreeService;
import com.yihu.jw.base.service.org.*;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.base.org.BaseOrgUserDO;
@@ -74,7 +73,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    private WlyyUserAreaDao userAreaDao;
    @Autowired
    private WlyyUserEquipmentDao userEquipmentDao;
    
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Autowired
@@ -82,7 +81,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    @Value("${configDefault.saasId}")
    private String defaultSaasId;
    
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
@@ -93,16 +92,16 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    public UserDO registerWithIdcard(UserDO userDO) {
        userDO.setSalt(randomString(5));
        if (StringUtils.isEmpty(userDO.getEnabled())){
        if (StringUtils.isEmpty(userDO.getEnabled())) {
            userDO.setEnabled(true);
        }else {
        } else {
            userDO.setEnabled(userDO.getEnabled());
        }
        userDO.setLocked(false);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
        if (StringUtils.isEmpty(password)) {
            password = userDO.getIdcard().substring(userDO.getIdcard().length()-6,userDO.getIdcard().length());
            password = userDO.getIdcard().substring(userDO.getIdcard().length() - 6, userDO.getIdcard().length());
        }
        userDO.setPassword(MD5.md5Hex(password + "{" + userDO.getSalt() + "}"));
        return userDao.save(userDO);
@@ -121,7 +120,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
        if (StringUtils.isEmpty(password)) {
            password = userDO.getMobile().substring(userDO.getMobile().length()-6, userDO.getMobile().length());
            password = userDO.getMobile().substring(userDO.getMobile().length() - 6, userDO.getMobile().length());
        }
        userDO.setPassword(MD5.md5Hex(password + "{" + userDO.getSalt() + "}"));
        return userDao.save(userDO);
@@ -163,11 +162,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    /**
     * 判断用户名是否存在
     *
     * @param username
     * @return
     */
    public Boolean existUserName(String username){
        if(StringUtils.isEmpty(username)) {
    public Boolean existUserName(String username) {
        if (StringUtils.isEmpty(username)) {
            return null;
        }
        return userDao.existsByUsername(username);
@@ -191,9 +191,10 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        Map<String, Object> userinfo = new HashedMap();
        UserDO user = userDao.findOne(id);
        System.out.println("用户信息：" + user);
        RoleDO role = null;
        if (user != null ) {
            if(!user.getEnabled()){
        if (user != null) {
            if (!user.getEnabled()) {
                throw new Exception("用户已失效！");
            }
            userinfo.put("id", user.getId());
@@ -206,10 +207,10 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            userinfo.put("roleCode", role.getCode());
            userinfo.put("system", role.getSystem());
            if (role.getType()==1) {
            if (role.getType() == 1) {
                //平台管理员信息获取
            } else if (role.getType()==2) {
            } else if (role.getType() == 2) {
                //saas平台管理员信息获取
                if (org.apache.commons.lang3.StringUtils.isNotBlank(user.getId())) {
                    SaasDO saas = saasDao.findOne(user.getSaasId());
@@ -219,31 +220,31 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                    userinfo.put("saas", ss);
                }
            } else if (role.getType()==3) {
            } else if (role.getType() == 3) {
                //機構管理員信息獲取
                String sql = "SELECT " +
                            " g.code AS orgCode, " +
                            " g.province_code AS provinceCode, " +
                            " g.province_name AS privinceName, " +
                            " g.city_code AS cityCode, " +
                            " g.city_name AS cityName, " +
                            " g.town_code AS townCode, " +
                            " g.town_name AS townName, " +
                            " g.street_code AS streetCode, " +
                            " g.street_name AS streetName, " +
                            " g.name, " +
                            " address " +
                            " FROM " +
                            " base_org g " +
                            " JOIN base_org_user u ON g.`code` = u.org_code " +
                            " WHERE  " +
                            " u.user_id = '" + id + "'";
                    List<Map<String, Object>> org = jdbcTemplate.queryForList(sql);
                    if (org != null && org.size() > 0) {
                        userinfo.put("org", org.get(0));
                    } else {
                        userinfo.put("org", null);
                    }
                        " g.code AS orgCode, " +
                        " g.province_code AS provinceCode, " +
                        " g.province_name AS privinceName, " +
                        " g.city_code AS cityCode, " +
                        " g.city_name AS cityName, " +
                        " g.town_code AS townCode, " +
                        " g.town_name AS townName, " +
                        " g.street_code AS streetCode, " +
                        " g.street_name AS streetName, " +
                        " g.name, " +
                        " address " +
                        " FROM " +
                        " base_org g " +
                        " JOIN base_org_user u ON g.`code` = u.org_code " +
                        " WHERE  " +
                        " u.user_id = '" + id + "'";
                List<Map<String, Object>> org = jdbcTemplate.queryForList(sql);
                if (org != null && org.size() > 0) {
                    userinfo.put("org", org.get(0));
                } else {
                    userinfo.put("org", null);
                }
            }
        }
        //機構管理員信息獲取
@@ -270,40 +271,40 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        } else {
            userinfo.put("org", null);
        }
    
        //密码过期
        userinfo.put("authPw",findDoctorPwlimitDate(id));
        //密码过期
        userinfo.put("authPw", findDoctorPwlimitDate(id));
        System.out.println("信息==>" + JSON.toJSONString(userinfo));
        return userinfo;
    }
    
    public com.alibaba.fastjson.JSONObject findDoctorPwlimitDate(String user){
    public com.alibaba.fastjson.JSONObject findDoctorPwlimitDate(String user) {
        String key = "base:authPw:user:" + user;
        String authPw = redisTemplate.opsForValue().get(key);
        com.alibaba.fastjson.JSONObject valueJson = null;
        if(org.apache.commons.lang3.StringUtils.isNotBlank(authPw)){
            
        if (org.apache.commons.lang3.StringUtils.isNotBlank(authPw)) {
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("pwOverDue");
            String code[] = wlyyHospitalSysDictDO.getDictCode().split(",");
            Integer maxDateInt = Integer.parseInt(code[0]);
            Integer remainDateInt = Integer.parseInt(code[1]);
            
            valueJson = JSON.parseObject(authPw);
            Long updateTimeLong = valueJson.getLong("updateTime");
            Date updateTime = new Date();
            updateTime.setTime(updateTimeLong);
            Date maxDate = DateUtil.getPreDays(updateTime,maxDateInt);
            
            Long betweenDate = (maxDate.getTime() - new Date().getTime())/(60*60*24*1000);
            valueJson.put("betweenDate",betweenDate);
            if(betweenDate<remainDateInt){
                valueJson.put("remaind",true);
            }else {
                valueJson.put("remaind",false);
            Date maxDate = DateUtil.getPreDays(updateTime, maxDateInt);
            Long betweenDate = (maxDate.getTime() - new Date().getTime()) / (60 * 60 * 24 * 1000);
            valueJson.put("betweenDate", betweenDate);
            if (betweenDate < remainDateInt) {
                valueJson.put("remaind", true);
            } else {
                valueJson.put("remaind", false);
            }
        }else {
        } else {
            valueJson = new com.alibaba.fastjson.JSONObject();
            valueJson.put("isChanged",false);
            valueJson.put("isChanged", false);
        }
        return valueJson;
    }
@@ -349,7 +350,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        //组装用户与机构的关联关系
        List<BaseOrgUserDO> orgList = new ArrayList<>();
        BaseOrgUserDO orgUserDO = null;
        if(!CollectionUtils.isEmpty(org)){
        if (!CollectionUtils.isEmpty(org)) {
            for (Object obj : org) {
                try {
                    orgUserDO = objectMapper.readValue(obj.toString(), BaseOrgUserDO.class);
@@ -365,9 +366,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        }
        //area:[{"city":"","cityName":"","town":"","townName":"","hospital":"","hospitalName":""}]
        //用户所属区域添加
        if (area!=null&&area.size()!=0){
        if (area != null && area.size() != 0) {
            userAreaDao.deleteByUserId(userDO.getId());
            for (int i=0;i<area.size();i++){
            for (int i = 0; i < area.size(); i++) {
                JSONObject object = area.getJSONObject(i);
                WlyyUserAreaDO userAreaDO = new WlyyUserAreaDO();
                userAreaDO.setUserId(userDO.getId());
@@ -375,7 +376,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userAreaDO.setCityName(object.getString("cityName"));
                userAreaDO.setTown(object.getString("town"));
                userAreaDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                if (!StringUtils.isEmpty(object.getString("hospital"))) {
                    userAreaDO.setHospital(object.getString("hospital"));
                    userAreaDO.setHospitalName(object.getString("hospitalName"));
                }
@@ -387,9 +388,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        }
        //用户所管设备添加
        //equipment:[{"equipmentId":"","equipmentName":""}]
        if (equipment!=null&&equipment.size()!=0){
        if (equipment != null && equipment.size() != 0) {
            userEquipmentDao.deleteByUserId(userDO.getId());
            for (int i=0;i<equipment.size();i++){
            for (int i = 0; i < equipment.size(); i++) {
                JSONObject object = equipment.getJSONObject(i);
                WlyyUserEquipmentDO userEquipmentDO = new WlyyUserEquipmentDO();
                userEquipmentDO.setDel(1);
@@ -398,7 +399,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userEquipmentDO.setCityName(object.getString("cityName"));
                userEquipmentDO.setTown(object.getString("town"));
                userEquipmentDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                if (!StringUtils.isEmpty(object.getString("hospital"))) {
                    userEquipmentDO.setHospital(object.getString("hospital"));
                    userEquipmentDO.setHospitalName(object.getString("hospitalName"));
                }
@@ -410,8 +411,8 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            }
        }
        JSONObject returnMsg = new JSONObject();
        returnMsg.put("username",userDO.getUsername());
        returnMsg.put("password",userDO.getIdcard().substring(userDO.getIdcard().length()-6,userDO.getIdcard().length()));
        returnMsg.put("username", userDO.getUsername());
        returnMsg.put("password", userDO.getIdcard().substring(userDO.getIdcard().length() - 6, userDO.getIdcard().length()));
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", returnMsg);
        return result;
@@ -481,9 +482,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        //area:[{"city":"","cityName":"","town":"","townName":"","hospital":"","hospitalName":""}]
        //用户所属区域添加
        if (area!=null&&area.size()!=0){
        if (area != null && area.size() != 0) {
            userAreaDao.deleteByUserId(userDO.getId());
            for (int i=0;i<area.size();i++){
            for (int i = 0; i < area.size(); i++) {
                JSONObject object = area.getJSONObject(i);
                WlyyUserAreaDO userAreaDO = new WlyyUserAreaDO();
                userAreaDO.setUserId(userDO.getId());
@@ -491,7 +492,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userAreaDO.setCityName(object.getString("cityName"));
                userAreaDO.setTown(object.getString("town"));
                userAreaDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                if (!StringUtils.isEmpty(object.getString("hospital"))) {
                    userAreaDO.setHospital(object.getString("hospital"));
                    userAreaDO.setHospitalName(object.getString("hospitalName"));
                }
@@ -503,9 +504,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        }
        //用户所管设备添加
        //equipment:[{"equipmentId":"","equipmentName":""}]
        if (equipment!=null&&equipment.size()!=0){
        if (equipment != null && equipment.size() != 0) {
            userEquipmentDao.deleteByUserId(userDO.getId());
            for (int i=0;i<equipment.size();i++){
            for (int i = 0; i < equipment.size(); i++) {
                JSONObject object = equipment.getJSONObject(i);
                WlyyUserEquipmentDO userEquipmentDO = new WlyyUserEquipmentDO();
                userEquipmentDO.setDel(1);
@@ -514,7 +515,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userEquipmentDO.setCityName(object.getString("cityName"));
                userEquipmentDO.setTown(object.getString("town"));
                userEquipmentDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                if (!StringUtils.isEmpty(object.getString("hospital"))) {
                    userEquipmentDO.setHospital(object.getString("hospital"));
                    userEquipmentDO.setHospitalName(object.getString("hospitalName"));
                }
@@ -533,22 +534,23 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    /**
     * 获取单个用户信息
     *
     * @param userId 用户id
     * @return
     */
    public JSONObject getOneUserInfo(String userId) throws Exception{
    public JSONObject getOneUserInfo(String userId) throws Exception {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(userId)){
            result.put("msg","parameter userId is null ");
            result.put("response",ConstantUtils.FAIL);
        if (StringUtils.isEmpty(userId)) {
            result.put("msg", "parameter userId is null ");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        //用户基本信息
        UserDO user = userDao.findOne(userId);
        if(null == user){
            result.put("msg","User not exist for id:" + userId);
            result.put("response",ConstantUtils.FAIL);
        if (null == user) {
            result.put("msg", "User not exist for id:" + userId);
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        //用户角色
@@ -561,31 +563,32 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        List<WlyyUserEquipmentDO> userEquipmentDOList = userEquipmentDao.findAllByUserId(userId);
        //用户关联的机构
        List<BaseOrgUserDO>  orgList = baseOrgUserService.findAllByUserId(user.getId());
        List<BaseOrgUserDO> orgList = baseOrgUserService.findAllByUserId(user.getId());
        JSONObject userInfo = new JSONObject();
        userInfo.put("user",user);
        userInfo.put("role",roleDO);
        userInfo.put("userArea",userAreaDOList);
        userInfo.put("userEquipment",userEquipmentDOList);
        userInfo.put("org",orgList);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",userInfo);
        userInfo.put("user", user);
        userInfo.put("role", roleDO);
        userInfo.put("userArea", userAreaDOList);
        userInfo.put("userEquipment", userEquipmentDOList);
        userInfo.put("org", orgList);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", userInfo);
        return result;
    }
    /**
     * 租户只能给用户归属到自己租户底下的机构
     * 机构管理员只能属于一个租户
     *
     * @param saasid
     * @param userId
     * @return
     */
    public JSONObject generateUserOrgTree(String saasid,String userId,String roleId) throws IOException {
    public JSONObject generateUserOrgTree(String saasid, String userId, String roleId) throws IOException {
        JSONObject result = new JSONObject();
        List<OrgTree> orgList = new ArrayList<>();
        // 有归属租户加载saas底下的所有机构树列表，角色为机构管理员时不需要选管理机构
        String admin ="admin";
        if(!StringUtils.isEmpty(saasid) && !StringUtils.endsWithIgnoreCase(admin,roleId)){
        String admin = "admin";
        if (!StringUtils.isEmpty(saasid) && !StringUtils.endsWithIgnoreCase(admin, roleId)) {
            StringBuilder sql = new StringBuilder("SELECT " +
                    "  tree.* " +
                    " FROM " +
@@ -597,12 +600,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                    " and  saas.saasid = '{saasid}' " +
                    " and  (tree.code = org.code or tree.code = org.province_code or tree.code = org.city_code or tree.code = town_code) " +
                    " ORDER BY tree.name;");
            orgList = jdbcTemplate.query(sql.toString().replace("{saasid}",saasid),new BeanPropertyRowMapper(OrgTree.class));
            orgList = jdbcTemplate.query(sql.toString().replace("{saasid}", saasid), new BeanPropertyRowMapper(OrgTree.class));
        }
        if(!StringUtils.isEmpty(userId)){// 用户不为空表示修改，需要筛选出用户已经选择过的机构，设置checked为true
        if (!StringUtils.isEmpty(userId)) {// 用户不为空表示修改，需要筛选出用户已经选择过的机构，设置checked为true
            Set<String> codeSet = baseOrgUserService.findorgCodeListByUserId(userId);
            orgList.forEach( one -> {
                if(codeSet.contains(one.getCode())){
            orgList.forEach(one -> {
                if (codeSet.contains(one.getCode())) {
                    one.setChecked(true);
                }
            });
@@ -619,11 +622,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            orgList = jdbcTemplate.query(sql.toString().replace("{userId}",userId),new BeanPropertyRowMapper(OrgTree.class));*/
        }
        if(!CollectionUtils.isEmpty(orgList)){
            String tree = orgTreeService.makeTree(orgList,false,true);
            result.put("msg",objectMapper.readValue(tree,JSONArray.class));
        }else{
            result.put("msg",orgList);
        if (!CollectionUtils.isEmpty(orgList)) {
            String tree = orgTreeService.makeTree(orgList, false, true);
            result.put("msg", objectMapper.readValue(tree, JSONArray.class));
        } else {
            result.put("msg", orgList);
        }
        result.put("response", ConstantUtils.SUCCESS);
        return result;
@@ -632,34 +635,35 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    /**
     * 租户只能给用户归属到自己租户底下的机构
     * 机构管理员只能属于一个租户，增加社区树
     *
     * @param saasid
     * @param userId
     * @return
     */
    public JSONObject orgChoiceInfo(String saasid,String userId,String roleId) throws IOException {
    public JSONObject orgChoiceInfo(String saasid, String userId, String roleId) throws IOException {
        JSONObject result = new JSONObject();
        List<OrgTree> orgList = new ArrayList<>();
        String admin = "admin";
        // 有归属租户加载saas底下的所有机构树列表，角色为机构管理员时不需要选管理机构
        if(!StringUtils.isEmpty(saasid) && !StringUtils.endsWithIgnoreCase(admin,roleId)){
        if (!StringUtils.isEmpty(saasid) && !StringUtils.endsWithIgnoreCase(admin, roleId)) {
            StringBuilder sql = new StringBuilder("SELECT tree.*  FROM org_tree tree, base_org org, base_org_saas saas WHERE org.code = saas.org_code and 'null'= '{saasid}';");
 //           StringBuilder sql = new StringBuilder("SELECT tree.* FROM base_org base , org_tree tree WHERE base.`code` = tree.code ");
            orgList = jdbcTemplate.query(sql.toString().replace("{saasid}","null"),new BeanPropertyRowMapper(OrgTree.class));
            //           StringBuilder sql = new StringBuilder("SELECT tree.* FROM base_org base , org_tree tree WHERE base.`code` = tree.code ");
            orgList = jdbcTemplate.query(sql.toString().replace("{saasid}", "null"), new BeanPropertyRowMapper(OrgTree.class));
        }
        if(!StringUtils.isEmpty(userId)){// 用户不为空表示修改，需要筛选出用户已经选择过的机构，设置checked为true
        if (!StringUtils.isEmpty(userId)) {// 用户不为空表示修改，需要筛选出用户已经选择过的机构，设置checked为true
            Set<String> codeSet = baseOrgUserService.findorgCodeListByUserId(userId);
            orgList.forEach( one -> {
                if(codeSet.contains(one.getCode())){
            orgList.forEach(one -> {
                if (codeSet.contains(one.getCode())) {
                    one.setChecked(true);
                }
            });
        }
        if(!CollectionUtils.isEmpty(orgList)){
            String tree = orgTreeService.makeTree(orgList,false,true);
            result.put("msg",objectMapper.readValue(tree,JSONArray.class));
        }else{
            result.put("msg",orgList);
        if (!CollectionUtils.isEmpty(orgList)) {
            String tree = orgTreeService.makeTree(orgList, false, true);
            result.put("msg", objectMapper.readValue(tree, JSONArray.class));
        } else {
            result.put("msg", orgList);
        }
        result.put("response", ConstantUtils.SUCCESS);
        return result;
@@ -668,28 +672,29 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    /**
     * 用户修改密码
     *
     * @param userId
     * @return
     */
    public JSONObject updatePwd(String userId,String pwd,String oldpwd){
    public JSONObject updatePwd(String userId, String pwd, String oldpwd) {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
        if(null == user){
        if (null == user) {
            result.put("response", ConstantUtils.FAIL);
            result.put("msg","user not exist for id : " + userId);
            result.put("msg", "user not exist for id : " + userId);
            return result;
        }
    
        String orgPwMd5 = MD5.md5Hex(oldpwd + "{" + user.getSalt() + "}");
        if(!orgPwMd5.equals(user.getPassword())){
        if (!orgPwMd5.equals(user.getPassword())) {
            result.put("response", ConstantUtils.FAIL);
            result.put("msg","旧密码不正确！");
            result.put("msg", "旧密码不正确！");
            return result;
        }
        if(StringUtils.isEmpty(pwd)){
        if (StringUtils.isEmpty(pwd)) {
            result.put("response", ConstantUtils.FAIL);
            result.put("msg","新密码不能为空！");
            result.put("msg", "新密码不能为空！");
            return result;
        }
@@ -700,68 +705,69 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        user.setPassword(MD5.md5Hex(pwd + "{" + user.getSalt() + "}"));
        userDao.save(user);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", "修改成功");
    
        //设置用户密码过期时间
        saveUserPwlimitDate(userId);
        
        return result;
    }
    
    public boolean saveUserPwlimitDate(String user){
    public boolean saveUserPwlimitDate(String user) {
        String key = "base:authPw:user:" + user;
        com.alibaba.fastjson.JSONObject valueJson = new com.alibaba.fastjson.JSONObject();
        valueJson.put("updateTime",new Date().getTime());
        valueJson.put("isChanged",true);
        redisTemplate.opsForValue().set(key,valueJson.toJSONString());
        valueJson.put("updateTime", new Date().getTime());
        valueJson.put("isChanged", true);
        redisTemplate.opsForValue().set(key, valueJson.toJSONString());
        return true;
    }
    
    /**
     * 用户重置密码
     *
     * @param userId
     * @return
     */
    public JSONObject resetPassword(String userId){
    public JSONObject resetPassword(String userId) {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
        if(null == user){
        if (null == user) {
            result.put("response", ConstantUtils.FAIL);
            result.put("msg","user not exist for id : " + userId);
            result.put("msg", "user not exist for id : " + userId);
            return result;
        }
//        registerWithIdcard(user);
        String idcard = user.getIdcard();
        String mobile = user.getMobile();
        String password = null;
        
        if(!StringUtils.isEmpty(password)&&idcard.length()>10){
            password = idcard.substring(idcard.length()-6,idcard.length());
        }else if(!StringUtils.isEmpty(mobile)&&mobile.length()>=11){
            password = mobile.substring(mobile.length()-6,mobile.length());
        }
        
        if(StringUtils.isEmpty(password)){
        if (!StringUtils.isEmpty(password) && idcard.length() > 10) {
            password = idcard.substring(idcard.length() - 6, idcard.length());
        } else if (!StringUtils.isEmpty(mobile) && mobile.length() >= 11) {
            password = mobile.substring(mobile.length() - 6, mobile.length());
        }
        if (StringUtils.isEmpty(password)) {
            result.put("response", ConstantUtils.FAIL);
            result.put("msg","idcard or moblie not exist : " + userId);
            result.put("msg", "idcard or moblie not exist : " + userId);
            return result;
        }
        
        user.setSalt(randomString(5));
        user.setEnabled(true);
        user.setLocked(false);
        user.setLoginFailureCount(0);
        if ("iottest".equals(springProfile)||//物联网
             "iotprod".equals(springProfile)||//物联网
             "iotprodIn".equals(springProfile)//物联网
        if ("iottest".equals(springProfile) ||//物联网
                "iotprod".equals(springProfile) ||//物联网
                "iotprodIn".equals(springProfile)//物联网
        ) {
            password = "a"+password+"*";
            password = "a" + password + "*";
        }
        user.setPassword(MD5.md5Hex(password + "{" + user.getSalt() + "}"));
        userDao.save(user);
        saveUserPwlimitDate(userId);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", password);
        return result;
    }
@@ -769,11 +775,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    /**
     * 判断用户账号是否存在
     *
     * @param code
     * @return
     */
    public Boolean existUsername(String code){
        if(StringUtils.isEmpty(code)) {
    public Boolean existUsername(String code) {
        if (StringUtils.isEmpty(code)) {
            return null;
        }
        return userDao.existsByUsername(code);
@@ -782,58 +789,61 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    /**
     * 生效或失效单个用户
     *
     * @param userId
     * @param lock
     * @return
     */
    public JSONObject lockOrUnlocakUser(String userId,boolean lock){
    public JSONObject lockOrUnlocakUser(String userId, boolean lock) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(userId) || StringUtils.isEmpty(lock)){
            result.put("msg","parameter id or del is null");
            result.put("response",ConstantUtils.FAIL);
        if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(lock)) {
            result.put("msg", "parameter id or del is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        UserDO user = userDao.findOne(userId);
        if( null == user ){
            result.put("msg","user not exist for id:" + userId);
            result.put("response",ConstantUtils.FAIL);
        if (null == user) {
            result.put("msg", "user not exist for id:" + userId);
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        user.setLocked(lock);
        user.setLockedDate(new Date());
        this.save(user);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }
    /**
     * 生效或失效单个用户
     *
     * @param userId
     * @param lock
     * @return
     */
    public JSONObject enableOrDisable(String userId,boolean lock){
    public JSONObject enableOrDisable(String userId, boolean lock) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(userId) || StringUtils.isEmpty(lock)){
            result.put("msg","parameter id or del is null");
            result.put("response",ConstantUtils.FAIL);
        if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(lock)) {
            result.put("msg", "parameter id or del is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        UserDO user = userDao.findOne(userId);
        if( null == user ){
            result.put("msg","user not exist for id:" + userId);
            result.put("response",ConstantUtils.FAIL);
        if (null == user) {
            result.put("msg", "user not exist for id:" + userId);
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        user.setEnabled(lock);
        this.save(user);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }
    /**
     * 用户信息列表
     *
     * @param name
     * @param saasid
     * @param roleId
@@ -842,7 +852,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     * @return
     * @throws Exception
     */
    public JSONObject userInfoList(String name,String saasid,String roleId,int page,int size,String wechatId) throws Exception {
    public JSONObject userInfoList(String name, String saasid, String roleId, int page, int size, String wechatId) throws Exception {
        JSONObject result = new JSONObject();
   /*     int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : page * size;*/
@@ -899,7 +909,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
//        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        String finalSql="SELECT\n" +
        String finalSql = "SELECT\n" +
                "\t\t\tusr . ID AS \"id\",\n" +
                "\t\t\tusr . NAME AS \"realName\",\n" +
                "\t\t\tusr .username AS \"username\",\n" +
@@ -918,32 +928,32 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                "\t\tbase_role ROLE\n" +
                "\tWHERE\n" +
                "\t\tusr .saas_id = saas. ID\n" +
                "\tAND usr .role_id = ROLE . ID\n" ;
                if(!realName.equals(null) && !realName.equals("")){
                    finalSql = finalSql + " and usr . NAME LIKE '%"+realName+"%'";
                }
                if(!saasidValue.equals(null) && !saasidValue.equals("")){
                    finalSql = finalSql + " and saas. id = '"+saasidValue+"'";
                }
                if(!roleIdValue.equals(null) && !roleIdValue.equals("")){
                    finalSql = finalSql + " and usr .role_id = '"+roleIdValue+"'";
                }
                finalSql = finalSql + " ORDER BY usr .create_time DESC";
        Logger.getAnonymousLogger().info("finalSql="+finalSql);
                "\tAND usr .role_id = ROLE . ID\n";
        if (!realName.equals(null) && !realName.equals("")) {
            finalSql = finalSql + " and usr . NAME LIKE '%" + realName + "%'";
        }
        if (!saasidValue.equals(null) && !saasidValue.equals("")) {
            finalSql = finalSql + " and saas. id = '" + saasidValue + "'";
        }
        if (!roleIdValue.equals(null) && !roleIdValue.equals("")) {
            finalSql = finalSql + " and usr .role_id = '" + roleIdValue + "'";
        }
        finalSql = finalSql + " ORDER BY usr .create_time DESC";
        Logger.getAnonymousLogger().info("finalSql=" + finalSql);
        String sql = finalSql
                .replace("{realName}","%" + realName + "%")
                .replace("{saasid}",saasidValue)
                .replace("{roleId}",roleIdValue);
                .replace("{realName}", "%" + realName + "%")
                .replace("{saasid}", saasidValue)
                .replace("{roleId}", roleIdValue);
        List<Map<String, Object>> list=null;
        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
        List<Map<String, Object>> list = null;
        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)) {
            if (flag){
                sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
                Logger.getAnonymousLogger().info("sql="+sql);
            if (flag) {
                sql += " LIMIT  " + (page - 1) * size + "," + size + "";
                Logger.getAnonymousLogger().info("sql=" + sql);
                list = jdbcTemplate.queryForList(sql);
            }else {
                String oracleSql="SELECT\n" +
            } else {
                String oracleSql = "SELECT\n" +
                        "\t*\n" +
                        "FROM\n" +
                        "\t(\n" +
@@ -952,21 +962,21 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                        "\t\tFROM\n" +
                        "\t\t\t(";
                oracleSql+=sql;
                oracleSql += sql;
                oracleSql+="\t\t\t) A\n" +
                oracleSql += "\t\t\t) A\n" +
                        "\t\tWHERE\n" +
                        "  ROWNUM <="+page*size +
                        "  ROWNUM <=" + page * size +
                        "\t) \n" +
                        "WHERE\n" +
                        "\tROWNUM >= "+(page-1)*size;
                Logger.getAnonymousLogger().info("oracleSql="+oracleSql);
                        "\tROWNUM >= " + (page - 1) * size;
                Logger.getAnonymousLogger().info("oracleSql=" + oracleSql);
                list = jdbcTemplate.queryForList(oracleSql);
            }
        }else {
            sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
            Logger.getAnonymousLogger().info("sql="+sql);
        } else {
            sql += " LIMIT  " + (page - 1) * size + "," + size + "";
            Logger.getAnonymousLogger().info("sql=" + sql);
            list = jdbcTemplate.queryForList(sql);
        }
@@ -980,22 +990,22 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                "WHERE " +
                "  usr.saas_id = saas.id " +
                "  AND " +
                "  usr.role_id = role.id " ;
                if(!realName.equals(null) && !realName.equals("")){
                    countSql = countSql + " and usr . NAME LIKE '%"+realName+"%'";
                }
                if(!saasidValue.equals(null) && !saasidValue.equals("")){
                    countSql = countSql + " and saas. id = '"+saasidValue+"'";
                }
                if(!roleIdValue.equals(null) && !roleIdValue.equals("")){
                    countSql = countSql + " and usr .role_id = '"+roleIdValue+"'";
                }
        Logger.getAnonymousLogger().info("countSql="+countSql);
                "  usr.role_id = role.id ";
        if (!realName.equals(null) && !realName.equals("")) {
            countSql = countSql + " and usr . NAME LIKE '%" + realName + "%'";
        }
        if (!saasidValue.equals(null) && !saasidValue.equals("")) {
            countSql = countSql + " and saas. id = '" + saasidValue + "'";
        }
        if (!roleIdValue.equals(null) && !roleIdValue.equals("")) {
            countSql = countSql + " and usr .role_id = '" + roleIdValue + "'";
        }
        Logger.getAnonymousLogger().info("countSql=" + countSql);
        String finalCountSql = countSql
                .replace("{realName}", "%" + realName + "%")
                .replace("{saasid}",  saasidValue )
                .replace("{roleId}",  roleIdValue );
        Logger.getAnonymousLogger().info("finalCountSql="+finalCountSql);
                .replace("{saasid}", saasidValue)
                .replace("{roleId}", roleIdValue);
        Logger.getAnonymousLogger().info("finalCountSql=" + finalCountSql);
        Integer count = jdbcTemplate.queryForObject(finalCountSql, Integer.class);
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/async/AsynService.java

@@ -44,7 +44,7 @@ public class AsynService {
    @Autowired
    private ImUtil imUtill;
    //基卫服务地址
    @Value("${sign.check_upload}")
//    @Value("${sign.check_upload}")
    private String jwUrl;
    @Autowired
    private HttpClientUtil httpClientUtil;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/consult/controller/ConsultController.java

@@ -102,10 +102,10 @@ public class ConsultController extends EnvelopRestEndpoint {
    @Autowired
    WeiXinAccessTokenUtils weiXinAccessTokenUtils;
    @Value("${doctorAssistant.api}")
//    @Value("${doctorAssistant.api}")
    private String doctorAssistant;
    @Value("${doctorAssistant.target_url}")
//    @Value("${doctorAssistant.target_url}")
    private String targetUrl;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/consult/controller/DoctorConsultController.java

@@ -39,9 +39,9 @@ import org.springframework.web.bind.annotation.RestController;
@Api(description = "三师咨询")
public class DoctorConsultController extends EnvelopRestEndpoint {
    @Value("${doctorAssistant.api}")
//    @Value("${doctorAssistant.api}")
    private String doctorAssistant;
    @Value("${doctorAssistant.target_url}")
//    @Value("${doctorAssistant.target_url}")
    private String targetUrl;
    @Autowired
    private ConsultTeamService consultTeamService;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/consult/service/ConsultTeamService.java

@@ -3347,9 +3347,9 @@ public class ConsultTeamService extends ConsultService {
            return null;
        }
        //这是id
//        ConsultDo consult = consultDao.queryByIdAndType(code, type);
        ConsultDo consult = consultDao.queryByIdAndType(code, type);
        ConsultDo consult = consultDao.findByRelationCode(code);
//        ConsultDo consult = consultDao.findByRelationCode(code);
        if (null == consult) {
            result.put("data", "");

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/DoorOrderController.java

@@ -115,6 +115,19 @@ public class DoorOrderController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 根据签约id或者订单id获取服务项机构
     */
    @GetMapping(value = "getOgrById")
    @ApiOperation(value = "服务人员列表（医生列表）")
    public Envelop getOgrById(
            @ApiParam(name = "signId", value = "签约id") @RequestParam(value = "signId", required = false) String signId,
            @ApiParam(name = "orderId", value = "订单id") @RequestParam(value = "orderId", required = false) String orderId) {
        List<Map<String, Object>> list = wlyyDoorServiceOrderService.getOgrById(signId,orderId);
        return success("查询成功", list);
    }
    /**
     * 查询所有社区医生的机构
@@ -126,6 +139,7 @@ public class DoorOrderController extends EnvelopRestEndpoint {
        return success("查询成功", list);
    }
    @GetMapping(value = "queryDoctorList")
    @ApiOperation(value = "服务人员列表（医生列表）")
    public Envelop queryDoctorList(

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/DoorOrderService.java

@@ -66,9 +66,9 @@ public class DoorOrderService {
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Value("${sign.check_upload}")
    //    @Value("${sign.check_upload}")
    private String jwUrl;
    @Value("${server.server_url}")
    //    @Value("${server.server_url}")
    private String wxServerUrl;
    //图片服务地址
    @Value("${fastDFS.fastdfs_file_url}")
@@ -146,22 +146,45 @@ public class DoorOrderService {
    /**
     * 服务项查询
     *
     * @param signId 签约id
     * @param type doorService 上门服务
     * @param type   doorService 上门服务
     */
    public PageEnvelop getServiceItem(String signId, String name, String type, Integer page, Integer size){
        String sql = "SELECT si.* ";
        String countSql = "select count(si.id) ";
        String filter = " from base_service_package_sign_record r,base_service_package_item i,base_service_package_sub_item si,base_service_package_item_relational ir " +
                "WHERE r.id = '"+signId+"' and i.service_package_id=r.service_package_id and i.`code`='"+type+"' and si.status='1' " +
                " and i.id = ir.item_id and ir.sub_item_id= si.id ";
        if(StringUtils.isNotBlank(name)){
            filter += " and si.name like '%"+name+"%' ";
        }
        String oderBy = " order by si.sort limit "+(page-1)*size+","+size;
        List<ServicePackageSubItemDO> list = jdbcTemplate.query(sql+filter+oderBy,new BeanPropertyRowMapper<>(ServicePackageSubItemDO.class));
        long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
        return PageEnvelop.getSuccessListWithPage("",list,page,size,count);
    public PageEnvelop getServiceItem(String signId, String name, String type, Integer page, Integer size) {
//        String sql = "SELECT si.* ";
//        String countSql = "select count(si.id) ";
//        String filter = " from base_service_package_sign_record r," +
//                "base_service_package_item i,base_service_package_sub_item si,base_service_package_item_relational ir " +
//                "WHERE r.id = '"+signId+"' and i.service_package_id=r.service_package_id and i.`code`='"+type+"' and si.status='1' " +
//                " and i.id = ir.item_id and ir.sub_item_id= si.id ";
//        if(StringUtils.isNotBlank(name)){
//            filter += " and si.name like '%"+name+"%' ";
//        }
//        String oderBy = " order by si.sort limit "+(page-1)*size+","+size;
        String sql = "SELECT e.* ";
        String countSql = "select count(e.id) ";
        String filter =
                "FROM\n" +
                        "	base_service_package_sign_record a \n" +
                        "	INNER JOIN base_service_package_item b ON a.service_package_id = b.service_package_id\n" +
                        "	INNER JOIN base_service_package_item c ON c.id=b.service_package_item_id\n" +
                        "	INNER JOIN base_service_package_item_relational d ON d.item_id=c.id \n" +
                        "	INNER JOIN base_service_package_sub_item e ON e.id=d.sub_item_id\n" +
                        "WHERE 1=1\n" +
                        "	AND b.`code` = '" + type + "' \n" +
                        "	AND e.`status` = '1' \n" +
                        "	AND a.id = '" + signId + "' ";
        if (StringUtils.isNotBlank(name)) {
            filter += " and e.name like '%" + name + "%' ";
        }
        String oderBy = " order by e.sort limit " + (page - 1) * size + "," + size;
        sql = sql + filter + oderBy;
        countSql = countSql + filter;
        List<ServicePackageSubItemDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ServicePackageSubItemDO.class));
        long count = jdbcTemplate.queryForObject(countSql, Long.class);
        return PageEnvelop.getSuccessListWithPage("", list, page, size, count);
    }
    public Map<String, String> getNumGroupByStatusTeam(String doctor, Integer type) {
@@ -549,32 +572,37 @@ public class DoorOrderService {
     * @throws Exception
     */
    public WlyyDoorConclusionDO updateDoorConclusion(String model, Integer examPapeStatus) throws Exception {
        ObjectMapper objectMapper = new ObjectMapper();
        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd"));
        WlyyDoorConclusionDO doorConclusion = objectMapper.readValue(model, WlyyDoorConclusionDO.class);
        WlyyDoorServiceOrderDO one = doorServiceOrderDao.findOne(doorConclusion.getOrderId());
        BaseDoctorDO doctorVO = doctorDao.findById(one.getDoctor());
        if (doorConclusion != null && StringUtils.isNotEmpty(doorConclusion.getId())) {
            doorConclusion.setUpdateTime(new Date());
            doorConclusion.setUpdateUser(one.getDoctor());
            doorConclusion.setUpdateUserName(null != doctorVO ? doctorVO.getName() : null);
        } else {
            doorConclusion.setCreateTime(new Date());
            doorConclusion.setUpdateTime(new Date());
            doorConclusion.setCreateUser(one.getDoctor());
            doorConclusion.setCreateUserName(null != doctorVO ? doctorVO.getName() : null);
        }
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd"));
            WlyyDoorConclusionDO doorConclusion = objectMapper.readValue(model, WlyyDoorConclusionDO.class);
            WlyyDoorServiceOrderDO one = doorServiceOrderDao.findOne(doorConclusion.getOrderId());
            BaseDoctorDO doctorVO = doctorDao.findById(one.getDoctor());
            if (doorConclusion != null && StringUtils.isNotEmpty(doorConclusion.getId())) {
                doorConclusion.setUpdateTime(new Date());
                doorConclusion.setUpdateUser(one.getDoctor());
                doorConclusion.setUpdateUserName(null != doctorVO ? doctorVO.getName() : null);
            } else {
                doorConclusion.setCreateTime(new Date());
                doorConclusion.setUpdateTime(new Date());
                doorConclusion.setCreateUser(one.getDoctor());
                doorConclusion.setCreateUserName(null != doctorVO ? doctorVO.getName() : null);
            }
        //服务时间 为空的 默认使用医生签到时间 1.7.0.5修改
        if (null == doorConclusion.getServiceTime() || StringUtils.isBlank(doorConclusion.getServiceTime().toString())) {
            doorConclusion.setServiceTime(one.getDoctorSignTime());
            //服务时间 为空的 默认使用医生签到时间 1.7.0.5修改
            if (null == doorConclusion.getServiceTime() || StringUtils.isBlank(doorConclusion.getServiceTime().toString())) {
                doorConclusion.setServiceTime(one.getDoctorSignTime());
            }
            doorConclusionDao.save(doorConclusion);
            // 设置是否需要上传补录报告
            one.setExamPaperStatus(examPapeStatus);
            one.setConclusionStatus(2);
            doorServiceOrderDao.save(one);
            return doorConclusion;
        } catch (IOException e) {
            e.printStackTrace();
        }
        doorConclusionDao.save(doorConclusion);
        // 设置是否需要上传补录报告
        one.setExamPaperStatus(examPapeStatus);
        one.setConclusionStatus(2);
        doorServiceOrderDao.save(one);
        return doorConclusion;
        return null;
    }
    public WlyyDoorServiceOrderDO acceptOrder1(String orderId, String jobCode, String jobCodeName, int hospitalLevel) throws Exception {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/WlyyDoorPrescriptionService.java

@@ -61,7 +61,7 @@ public class WlyyDoorPrescriptionService {
    private BaseDoctorDao doctorDao;
    @Autowired
    private WlyyDoorPrescriptionDrugDao doorPrescriptionDrugDao;
    @Value("${server.server_url}")
//    @Value("${server.server_url}")
    private String server_url;
    @Autowired
    private JdbcTemplate jdbcTemplate;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/WlyyDoorServiceOrderService.java

@@ -164,11 +164,11 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
    @Autowired
    FileUploadService fileUploadService;
    @Value("${neiwang.enable}")
    //    @Value("${neiwang.enable}")
    private Boolean isneiwang;  //如果不是内网项目要转到到内网wlyy在上传
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @Value("${neiwang.wlyy}")
    //    @Value("${neiwang.wlyy}")
    private String neiwangWlyy;  //内网的项目地址
    @Value("${wlyy.url}")
@@ -1305,7 +1305,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
     * 如果是外网那是发送到内网的服务器
     */
    public UploadVO PrescriptionQRCodetoNeiWang(InputStream ipt) throws Exception {
        String filename = "QRCode_" + System.currentTimeMillis()+".jpg";
        String filename = "QRCode_" + System.currentTimeMillis() + ".jpg";
        String fileUrls = "";
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@@ -2012,7 +2012,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                "  o.serve_lat as lat, " +
                "  o.`status` as status, " +
                "  o.`dispatcher_name` as dispatcherName, " +
                "  concat( o.patient,'_' ,c.`code`, '_',o.`number`,'_11' ) as sessionId, " +
                "  concat( o.patient,'_' ,c.`id`, '_',o.`number`,'_11' ) as sessionId, " +
                "   t1.`type` as patientType " +
                " FROM " +
                " ( wlyy_door_service_order o " +
@@ -3066,9 +3066,10 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        String sql = "SELECT * from base_doctor doc WHERE doctor_level=1 and id not in ( " +
                "SELECT doctor from wlyy_door_doctor_status " +
                ")";
        if (org.apache.commons.lang.StringUtils.isNotBlank(hospital)) {
            sql += "and EXISTS (select id from base_doctor_hospital dh where doc.id = dh.doctor_code and dh.org_code='" + hospital + "' and dh.del=1 ) ";
        }
        //机构就不要了
//        if (org.apache.commons.lang.StringUtils.isNotBlank(hospital)) {
//            sql += "and EXISTS (select id from base_doctor_hospital dh where doc.id = dh.doctor_code and dh.org_code='" + hospital + "' and dh.del=1 ) ";
//        }
        List<BaseDoctorDO> doctorDOs = jdbcTemplate.query(sql, new BeanPropertyRowMapper(BaseDoctorDO.class));
        List<WlyyDoorDoctorStatusDO> doctorList = new ArrayList<>(doctorDOs.size());
@@ -3098,4 +3099,30 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        jdbcTemplate.execute(sql);
    }
    public List<Map<String, Object>> getOgrById(String signId, String orderId) {
        String sql = "";
        if (StringUtils.isNotBlank(signId)) {
            sql = "SELECT\n" +
                    "	b.* \n" +
                    "FROM\n" +
                    "	base_service_package_sign_record a\n" +
                    "	INNER JOIN base_service_package_item b ON a.service_package_id = b.service_package_id\n" +
                    "	AND a.id='" + signId + "'";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
            return list;
        }
        if (StringUtils.isNotBlank(orderId)) {
            sql = "SELECT\n" +
                    "	DISTINCT b.* \n" +
                    "FROM\n" +
                    "	base_service_package_sign_record a\n" +
                    "	INNER JOIN wlyy_door_service_order b ON a.service_package_id=b.package_id\n" +
                    "	INNER JOIN base_service_package_item c ON b.package_id = c.service_package_id\n" +
                    "	AND b.id='" + orderId + "'\n";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
            return list;
        }
        return null;
    }
}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java

@@ -111,10 +111,10 @@ public class FollowUpService {
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Value("${doctorAssistant.api}")
//    @Value("${doctorAssistant.api}")
    private String doctorAssistant;
    @Value("${doctorAssistant.target_url}")
//    @Value("${doctorAssistant.target_url}")
    private String targetUrl;
//
//    @Value("${es.type.FollowUpContent}")

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/jw/service/JwArchivesService.java

@@ -27,7 +27,7 @@ public class JwArchivesService {
    private SystemDictService systemDictService;
    @Autowired
    private com.yihu.jw.util.http.HttpClientUtil HttpClientUtil;
    @Value("${sign.check_upload}")
//    @Value("${sign.check_upload}")
    private String jwUrl;
    @Value("${testPattern.sign}")
    private String isClose;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/jw/service/JwSmjkService.java

@@ -32,7 +32,7 @@ import java.util.Map;
public class JwSmjkService {
    //基卫服务地址
    @Value("${sign.check_upload}")
//    @Value("${sign.check_upload}")
    private String jwUrl;
    @Value("${demo.flag}")

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java

@@ -71,7 +71,7 @@ public class RehabilitationInfoService  {
    
 
    //基卫服务地址
    @Value("${sign.check_upload}")
//    @Value("${sign.check_upload}")
    private String jwUrl;
    @Autowired

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/ZsRehabilitationInfoService.java

@@ -27,7 +27,7 @@ import java.util.*;
public class ZsRehabilitationInfoService {
    //基卫服务地址
    @Value("${sign.check_upload}")
//    @Value("${sign.check_upload}")
    private String jwUrl;
    @Autowired
    private HttpClientUtil httpClientUtil;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/upload/controller/FileUploadController.java

@@ -42,7 +42,7 @@ public class FileUploadController extends EnvelopRestEndpoint {
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @Value("${neiwang.enable}")
//    @Value("${neiwang.enable}")
    private Boolean isneiwang = false;  //如果不是内网项目要转到到内网wlyy在上传
    @Autowired

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/task/PushMsgTask.java

@@ -37,13 +37,13 @@ public class PushMsgTask {
    @Autowired
    private HttpUtil httpUtil;
    @Value("${server.server_url}")
//    @Value("${server.server_url}")
    private String server_url;
    @Value("${pushMes.method}")
//    @Value("${pushMes.method}")
    private String putMesMethod;
    @Value("${pushMes.redis_prescription_title}")
//    @Value("${pushMes.redis_prescription_title}")
    private String redisQueue;
    //    @Value("${putMesType.wechat}")
 //    @Value("${putMesType.wechat}")
    private String putMesType;
    //模板id

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/utils/DoctorAssistantUtil.java

@@ -17,9 +17,9 @@ import java.util.List;
@Component
public class DoctorAssistantUtil {
    @Value("${doctorAssistant.api}")
//    @Value("${doctorAssistant.api}")
    private String doctorAssistant;
    @Value("${doctorAssistant.target_url}")
//    @Value("${doctorAssistant.target_url}")
    private String targetUrl;
    @Autowired
    private HttpClientUtil httpClientUtil;

svr/svr-visit-behind/src/main/resources/application.yml

@@ -301,26 +301,26 @@ cloudCare:
# 20231012新增的
server:
  server_url: https://ehr.yihu.com/wlyy/
  # 服务器图片改存FastDFS地址
  server_img_url: http://172.26.0.110:8888/
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: https://ehr.yihu.com/wlyy/
  target_url: home/html/unreadMessageStatistic.html
sign:
  check_upload_sign: http://172.19.103.88:8011/wlyy_sign
  check_upload: http://172.26.0.118:8085/wlyy_service
pushMes:
  # 1为推送redis,0为推送消息队列
  method: 0
  # redis队列名称
  redis_prescription_title: redisMessage
##如果是外网项目就是flase 内网是true
neiwang:
  enable: true
  wlyy: http://172.26.0.110:22122/
#server:
#  server_url: https://ehr.yihu.com/wlyy/
#  # 服务器图片改存FastDFS地址
#  server_img_url: http://172.26.0.110:8888/
##医生助手服务器地址及模板跳转链接(医生未读消息统计页)
#doctorAssistant:
#  api: https://ehr.yihu.com/wlyy/
#  target_url: home/html/unreadMessageStatistic.html
#sign:
#  check_upload_sign: http://172.19.103.88:8011/wlyy_sign0
#  check_upload: http://172.26.0.118:8085/wlyy_service
#pushMes:
#  # 1为推送redis,0为推送消息队列
#  method: 0
#  # redis队列名称
#  redis_prescription_title: redisMessage
###如果是外网项目就是flase 内网是true
#neiwang:
#  enable: true
#  wlyy: http://172.26.0.110:22122/
basedb:
  name: base