Merge branch 'dev' of wangjun/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/BaseBannerDao.java

@@ -19,9 +19,9 @@ import java.util.Map;
 */
public interface BaseBannerDao extends PagingAndSortingRepository<BaseBannerDO, String>, JpaSpecificationExecutor<BaseBannerDO> {
    @Query( value = "select max(t.sort) AS \"zuida\" from base_banner t",nativeQuery = true)
    @Query( value = "select max(t.is_sort) AS \"zuida\" from base_banner t",nativeQuery = true)
    Integer getMaxSort();
    @Query( value = "select min(t.sort) AS \"zuixiao\" from base_banner t",nativeQuery = true)
    @Query( value = "select min(t.is_sort) AS \"zuixiao\" from base_banner t",nativeQuery = true)
    Integer getMinSort();

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerService.java

@@ -109,7 +109,7 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
                "p.saas_id as \"saas_id\"," +
                "p.name as \"name\"," +
                "p.description as \"description\"," +
                "p.img as \"img\", p.sort as \"sort\",p.status as \"status\",p.create_time as \"create_time\",p.create_user as \"create_user\"," +
                "p.img as \"img\", p.is_sort as \"sort\",p.status as \"status\",p.create_time as \"create_time\",p.create_user as \"create_user\"," +
                "p.create_user_name as \"create_user_name\"," +
                "p.update_time as \"update_time\"," +
                "p.update_user as \"update_user\",p.update_user_name as \"update_user_name\" from base_banner p where 1=1");
@@ -119,7 +119,7 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
            sql.append(" and p.status =:status");
        }
        sql.append(" order by  p.sort desc ");
        sql.append(" order by  p.is_sort desc ");
        if (isCount) {
            sql.append(") t");
        }
@@ -133,7 +133,7 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
     * @throws Exception
     */
    public BaseBannerDO creatBanner(BaseBannerDO baseBannerDO){
        String sql = "select max(sort) as sort from base_banner";
        String sql = "select max(is_sort) as sort from base_banner";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        Map<String,Object> map = list.get(0);
        int sort = 0;
@@ -208,17 +208,19 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        if(null!=bannerDO){
            sort = bannerDO.getSort();
        }
        String sql = "select id AS \"id\" from base_banner where sort > "+sort+" order by sort asc ";
        List<Map<String,Object>> list=hibenateUtils.createSQLQuery(sql,0,1);
        if (maxSort==sort){
            throw new Exception("不能上移");
        }
        String sql = "select t.id AS \"id\" from base_banner t where t.is_sort > "+sort+" order by t.is_sort asc ";
        System.out.println(sql);
        List<Map<String,Object>> list=hibenateUtils.createSQLQuery(sql,1,1);
        BaseBannerDO upPrevious = new BaseBannerDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
            upPrevious =baseBannerDao.findOne(prviousBannerId);
        }
        //BaseBannerDO upPrevious = baseBannerDao.upBanner(sort);
        if (maxSort==sort){
            throw new Exception("不能上移");
        }
        //交换sort值
        bannerDO.setSort(upPrevious.getSort());
        upPrevious.setSort(sort);
@@ -240,8 +242,11 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        if(null!=bannerDO){
            sort = bannerDO.getSort();
        }
        String sql = " select id AS \"id\" from base_banner where sort < "+sort+" order by sort desc ";
        List<Map<String,Object>> list=hibenateUtils.createSQLQuery(sql,0,1);
        if (minSort==sort){
            throw new Exception("不能下移");
        }
        String sql = " select id AS \"id\" from base_banner where is_sort < "+sort+" order by is_sort desc ";
        List<Map<String,Object>> list=hibenateUtils.createSQLQuery(sql,1,1);
        BaseBannerDO downPrevious = new BaseBannerDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
@@ -249,9 +254,6 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        }
        //获取的下一条banner
        //BaseBannerDO downPrevious = baseBannerDao.downBanner(sort);
        if (minSort==sort){
            throw new Exception("不能下移");
        }
        //交换sort值
        bannerDO.setSort(downPrevious.getSort());
        downPrevious.setSort(sort);

business/base-service/src/main/java/com/yihu/jw/hospital/survey/service/SurveyService.java

@@ -354,12 +354,22 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
     * @param tempId
     * @return
     */
    public WlyySurveyTemplateVO findSurveyTemplateById(String tempId){
    public WlyySurveyTemplateVO findSurveyTemplateById(String tempId,String userCode ){
        WlyySurveyTemplateDO templateDO = surveyTemplateDao.findOne(tempId);
        WlyySurveyTemplateVO templateVO = convertToModel(templateDO,WlyySurveyTemplateVO.class);
        templateVO.setLabels(findSurveyTemplateLabel(tempId));
        templateVO.setInsplabels(findSurveyInspTemplateLabel(tempId));
        String templateCode = templateDO.getId();
        String sqlUsed = "select t.used as \"used\" from wlyy_knowledge_article_user t where t.relation_code = '"+templateCode +"'";
        if(StringUtils.isNotEmpty(userCode)){
            sqlUsed += " and t.user_code = '"+userCode+"'";
        }
        System.out.println(sqlUsed);
        List<Map<String,Object>> listUsed = hibenateUtils.createSQLQuery(sqlUsed);
        if (listUsed.size()>0){
            String used = null!=listUsed.get(0).get("used")?listUsed.get(0).get("used").toString():"0";
            templateVO.setUsed(Integer.valueOf(used));
        }
        List<WlyySurveyTemplateQuestionDO> tqDOs = surveyTemplateQuestionDao.findByTemplateCodeAndDelOrderBySortAsc(tempId,"1");
        if(tqDOs!=null&&tqDOs.size()>0){
            //设置问题

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -25,7 +25,7 @@ public abstract class IntegerIdentityEntity implements Serializable {
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
/*    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
   /*@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/survey/SurveyEndpoint.java

@@ -105,8 +105,10 @@ public class SurveyEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.WlyySurvey.findSurveyTemplateById)
    @ApiOperation(value = "模板-获取模板详情（单条）")
    public ObjEnvelop findSurveyTemplateById(@ApiParam(name = "tempId", value = "模板ID")
                                             @RequestParam(value = "tempId",required = true) String tempId) throws Exception {
        return success(surveyService.findSurveyTemplateById(tempId));
                                             @RequestParam(value = "tempId",required = true) String tempId,
                                             @ApiParam(name = "userCode", value = "当前用户id")
                                             @RequestParam(value = "userCode",required = true) String userCode ) throws Exception {
        return success(surveyService.findSurveyTemplateById(tempId,userCode));
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyySurvey.saveSurveyTemplate)

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/BasePatientBusinessService.java

@@ -249,9 +249,11 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
				if (list.size() > 0) {
					for (Map<String, Object> map : list) {
						List<WlyySurveyLabelInfoVO>  wlyySurveyLabelInfoVOS= surveyService.findSurveyTemplateLabel(null==map.get("id")?"":map.get("id").toString());
						String createTime = null == map.get("create_time") ? "" : map.get("create_time").toString();
						String createTime = null == map.get("createTime") ? "" : map.get("createTime").toString();
                        String updateTime = null == map.get("updateTime") ? "" : map.get("updateTime").toString();
						String creater = null == map.get("creater") ? "" : map.get("creater").toString();
						map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                        map.put("update_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
						map.put("labels",wlyySurveyLabelInfoVOS);
						BaseDoctorDO doctorDO = doctorDao.findById(creater);
						if (null!=doctor){
@@ -282,9 +284,11 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
					for (Map<String, Object> map : list) {
						List<WlyySurveyLabelInfoVO>  wlyySurveyLabelInfoVOS= surveyService.findSurveyTemplateLabel(null==map.get("id")?"":map.get("id").toString());
						map.put("labels",wlyySurveyLabelInfoVOS);
						String createTime = null == map.get("create_time") ? "" : map.get("create_time").toString();
						String creater = null == map.get("creater") ? "" : map.get("creater").toString();
						map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                        String createTime = null == map.get("createTime") ? "" : map.get("createTime").toString();
                        String updateTime = null == map.get("updateTime") ? "" : map.get("updateTime").toString();
                        map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                        map.put("update_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
                        String creater = null == map.get("creater") ? "" : map.get("creater").toString();
						BaseDoctorDO doctorDO = doctorDao.findById(creater);
						if (null!=doctor){
							map.put("doctrName", doctorDO.getName());
@@ -318,9 +322,11 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
				for (Map<String, Object> map : list) {
					List<WlyySurveyLabelInfoVO>  wlyySurveyLabelInfoVOS= surveyService.findSurveyTemplateLabel(null==map.get("id")?"":map.get("id").toString());
					map.put("labels",wlyySurveyLabelInfoVOS);
					String createTime = null == map.get("create_time") ? "" : map.get("create_time").toString();
                    String createTime = null == map.get("createTime") ? "" : map.get("createTime").toString();
                    String updateTime = null == map.get("updateTime") ? "" : map.get("updateTime").toString();
                    map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                    map.put("update_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
					String creater = null == map.get("creater") ? "" : map.get("creater").toString();
					map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
					BaseDoctorDO doctorDO = doctorDao.findById(creater);
					if (null!=doctor){
						map.put("doctrName", doctorDO.getName());