Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -391,6 +391,20 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/appVersion";
    }
    /**
     * 基础消息
     */
    public static class BaseMessage extends Basic {
        public static final String PREFIX  = "/baseMessage";
    }
    /**
     * 基础消息类型
     */
    public static class BaseMessageType extends Basic {
        public static final String PREFIX  = "/baseMessageType";
    }
    /**
     * 基于MQ的消息推送
     */

server/svr-zipkin/src/main/java/com/yihu/ZipkinTrackServer.java

@@ -2,7 +2,8 @@ package com.yihu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import zipkin.server.EnableZipkinServer;
import zipkin.server.internal.EnableZipkinServer;
/**
 * Created by chenweida on 2017/5/18.

svr/svr-base/src/main/java/com/yihu/jw/base/dao/message/BaseMessageDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.BaseMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 消息表 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月14日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseMessageDao extends PagingAndSortingRepository<BaseMessageDO, Integer>, JpaSpecificationExecutor<BaseMessageDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/message/BaseMessageTypeDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.BaseMessageTypeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 消息类型字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月14日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseMessageTypeDao extends PagingAndSortingRepository<BaseMessageTypeDO, Integer>, JpaSpecificationExecutor<BaseMessageTypeDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/BaseMessageEndpoint.java

@@ -0,0 +1,104 @@
package com.yihu.jw.base.endpoint.message;
import com.yihu.jw.base.service.message.BaseMessageService;
import com.yihu.jw.entity.base.message.BaseMessageDO;
import com.yihu.jw.restmodel.base.message.BaseMessageVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 消息表控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月14日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseMessage.PREFIX)
@Api(value = "消息表管理", description = "消息表管理服务接口", tags = {"wlyy基础服务 - 消息表管理服务接口"})
public class BaseMessageEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseMessageService baseMessageService;
@PostMapping(value = BaseRequestMapping.BaseMessage.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseMessageVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseMessageDO baseMessage = toEntity(jsonData, BaseMessageDO.class);
    baseMessage = baseMessageService.save(baseMessage);
    return success(baseMessage, BaseMessageVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseMessage.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseMessageService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseMessage.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseMessageVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseMessageDO baseMessage = toEntity(jsonData, BaseMessageDO.class);
        if (null == baseMessage.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseMessage = baseMessageService.save(baseMessage);
        return success(baseMessage, BaseMessageVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseMessage.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseMessageVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @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) throws Exception {
            List<BaseMessageDO> baseMessages = baseMessageService.search(fields, filters, sorts, page, size);
                int count = (int)baseMessageService.getCount(filters);
                return success(baseMessages, count, page, size, BaseMessageVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseMessage.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseMessageVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseMessageDO> baseMessages = baseMessageService.search(fields, filters, sorts);
                  return success(baseMessages, BaseMessageVO.class);
         }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/BaseMessageTypeEndpoint.java

@@ -0,0 +1,104 @@
package com.yihu.jw.base.endpoint.message;
import com.yihu.jw.base.service.message.BaseMessageTypeService;
import com.yihu.jw.entity.base.message.BaseMessageTypeDO;
import com.yihu.jw.restmodel.base.message.BaseMessageTypeVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 消息类型字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月14日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseMessageType.PREFIX)
@Api(value = "消息类型字典管理", description = "消息类型字典管理服务接口", tags = {"wlyy基础服务 - 消息类型字典管理服务接口"})
public class BaseMessageTypeEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseMessageTypeService baseMessageTypeService;
@PostMapping(value = BaseRequestMapping.BaseMessageType.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseMessageTypeVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseMessageTypeDO baseMessageType = toEntity(jsonData, BaseMessageTypeDO.class);
    baseMessageType = baseMessageTypeService.save(baseMessageType);
    return success(baseMessageType, BaseMessageTypeVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseMessageType.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseMessageTypeService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseMessageType.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseMessageTypeVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseMessageTypeDO baseMessageType = toEntity(jsonData, BaseMessageTypeDO.class);
        if (null == baseMessageType.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseMessageType = baseMessageTypeService.save(baseMessageType);
        return success(baseMessageType, BaseMessageTypeVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseMessageType.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseMessageTypeVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @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) throws Exception {
            List<BaseMessageTypeDO> baseMessageTypes = baseMessageTypeService.search(fields, filters, sorts, page, size);
                int count = (int)baseMessageTypeService.getCount(filters);
                return success(baseMessageTypes, count, page, size, BaseMessageTypeVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseMessageType.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseMessageTypeVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseMessageTypeDO> baseMessageTypes = baseMessageTypeService.search(fields, filters, sorts);
                  return success(baseMessageTypes, BaseMessageTypeVO.class);
         }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/service/message/BaseMessageService.java

@@ -0,0 +1,24 @@
package com.yihu.jw.base.service.message;
import com.yihu.jw.base.dao.message.BaseMessageDao;
import com.yihu.jw.entity.base.message.BaseMessageDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * 
 * 消息表服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年09月14日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseMessageService extends BaseJpaService<BaseMessageDO, BaseMessageDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/message/BaseMessageTypeService.java

@@ -0,0 +1,22 @@
package com.yihu.jw.base.service.message;
import com.yihu.jw.base.dao.message.BaseMessageTypeDao;
import com.yihu.jw.entity.base.message.BaseMessageTypeDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 消息类型字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年09月14日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseMessageTypeService extends BaseJpaService<BaseMessageTypeDO, BaseMessageTypeDao> {
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -128,10 +128,12 @@ public class RehabilitationManageService {
                resultMap.put("id",one.get("id"));
                resultMap.put("status",one.get("status"));//康复计划状态
                //健康情况
                String healthyConditionSql =" select  label_name from "+basedb+".wlyy_sign_patient_label_info where status=1 and patient='"+one.get("patient")+"' and label_type=8";
                String healthyConditionSql =" select  label_name,label from "+basedb+".wlyy_sign_patient_label_info where status=1 and patient='"+one.get("patient")+"' and label_type=8";
                List<Map<String,Object>> healthyConditionList = jdbcTemplate.queryForList(healthyConditionSql);
                String healthyCondition = healthyConditionList.size()>0?healthyConditionList.get(0).get("label_name")+"":"";
                String healthyConditionType = healthyConditionList.size()>0?healthyConditionList.get(0).get("label")+"":"";
                resultMap.put("healthyCondition",healthyCondition);
                resultMap.put("healthyConditionType",healthyConditionType);
                //安排类型
                String planTypeName = null;
                Integer planTypeTemp = (Integer)one.get("plan_type");
@@ -186,6 +188,12 @@ public class RehabilitationManageService {
            Map<String,Object> resultMap = new HashMap<>();
            Integer isOperator = 0;
            resultMap.put("patientCode",patientCode);//居民code
            String healthyConditionSql =" select  label_name,label from "+basedb+".wlyy_sign_patient_label_info where status=1 and patient='"+patientCode+"' and label_type=8";
            List<Map<String,Object>> healthyConditionList = jdbcTemplate.queryForList(healthyConditionSql);
            String healthyCondition = healthyConditionList.size()>0?healthyConditionList.get(0).get("label_name")+"":"";
            String healthyConditionType = healthyConditionList.size()>0?healthyConditionList.get(0).get("label")+"":"";
            resultMap.put("healthyCondition",healthyCondition);
            resultMap.put("healthyConditionType",healthyConditionType);
            //专科医生
            String specialistRelationSql = "select r.*,t.name as teamName,h.name as specialistHospitalName from wlyy_specialist.wlyy_specialist_patient_relation r left join "+basedb+".wlyy_admin_team t on r.team_code=t.id left join "+basedb+".dm_hospital h on t.org_code=h.code where r.sign_status ='1' and r.status in('0','1') and r.patient='"+patientCode+"' and r.doctor='"+doctorCode+"'";
            List<Map<String,Object>> specialistRelationList = jdbcTemplate.queryForList(specialistRelationSql);
@@ -837,7 +845,10 @@ public class RehabilitationManageService {
            String id = one.get("id").toString();
            Map<String,Object> map = new HashMap<>();
            map.put("id",id);//id
            map.put("executeTime",executeTime);//执行时间
            List<RehabilitationOperateRecordsDO> rehabilitationOperateRecords = rehabilitationOperateRecordsDao.findByRehabilitationDetailId(id);
            Date completeTime = rehabilitationOperateRecords!=null&&rehabilitationOperateRecords.size()>0?rehabilitationOperateRecords.get(0).getCompleteTime():null;
            String completeTimeStr =  completeTime!=null?DateUtil.dateToStr(completeTime,"yyyy/MM/dd HH:mm"):"";
            map.put("executeTime",completeTimeStr);//执行时间
            map.put("title",title);//项目标题
            map.put("content",content);//项目内容
            map.put("statusName",statusName);//状态名称