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

luliqiang

2020-08-15 f0596fb2bf8fd0ecd8332b176549dad290a6a78d

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java

@@ -23,6 +23,7 @@
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -53,7 +54,8 @@
    private RabbitTemplate rabbitTemplate;

    private static final Logger logger = LoggerFactory.getLogger(ConsumptionRecordServiceImpl.class);

    @Value("${spring.profiles.active}")
    private String envName;
    /**
     * 列表
     *
@@ -678,6 +680,6 @@
                "\",\"departmentId\":\"" + consumptionRequest.getDepartmentId() +
                "\",\"doctorId\":\"" + consumptionRequest.getDoctorId() +
                "\",\"date\":\"" + DateUtils.formatDate(new Date(),"yyyy-MM-dd")+"\"}";
        rabbitTemplate.convertAndSend(ConsumptionConstant.EXCHANGE_DATA, ConsumptionConstant.ROUTINGKEY_DATA, context);
        rabbitTemplate.convertAndSend(ConsumptionConstant.EXCHANGE_DATA, ConsumptionConstant.ROUTINGKEY_DATA+envName, context);
    }
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml

@@ -105,7 +105,9 @@
WHERE
    is_del = 0
    AND enabled = 1
    <if test="p.templeteType!=null and p.templeteType!=''">
    AND templete_type = #{p.templeteType}
    </if>
    AND((
            hospital_id IS NULL
            AND hospital_id IS NULL

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.constant.DictionariesConstants;
@@ -917,6 +916,7 @@
        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("mobile", phone);
        selectMap.put("is_del", 0);
        selectMap.put("tenant_id", "hospital");
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
        return (sysUsers.size() > 0);
    }

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ConsumptionConstant.java

@@ -82,5 +82,5 @@

    //MQ相关
    String EXCHANGE_DATA="BICenter";
    String ROUTINGKEY_DATA="Kidgrow2033";
    String ROUTINGKEY_DATA="Kidgrow2033_";
}

 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml

@@ -217,7 +217,7 @@
      - /*/oauth/**
      - /actuator/health
      - /actuator/info
      - /api-sms/smsChangLan/send
      - /api-file/smsChangLan/send
      - /api-user/users/doctorUserReg
      - /api-user/users/isRegUser
      - /api-user/users/passwordByPhone
@@ -249,7 +249,7 @@
        /api-user/users-anon/**,
        /login.html,
        /user/login,
        /api-sms/smsChangLan/send,
        /api-file/smsChangLan/send,
        /api-user/users/doctorUserReg,
        /api-file/files-upload,
        /api-user/users/isRegUser,

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html

@@ -131,7 +131,7 @@
            }
            var proName = $('#product-search-value').val();
                var hospitalId = $('#hospitalId').val();
            table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,departmentId:'1252408277275664385',startTime: startTime, endTime: endTime } });
            table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,startTime: startTime, endTime: endTime } });
        });
       
        //比较日期大小