代码修改

business/sms-service/pom.xml

@@ -64,7 +64,7 @@
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-redis</artifactId>
<!--            <version>RELEASE</version>-->
            <version>RELEASE</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

svr/svr-base/pom.xml

@@ -180,7 +180,7 @@
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-core</artifactId>
<!--            <version>RELEASE</version>-->
            <version>RELEASE</version>
            <scope>compile</scope>
        </dependency>

svr/svr-base/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-base-lb
    name: svr-base
  cloud:
    config:
      failFast: true

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/lifeCare/DoctorLifeCareEndpoint.java

@@ -61,9 +61,11 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "顶部状态栏订单分类tab")
    public ObjEnvelop topStatusBarNum(
            @ApiParam(name = "doctor", value = "医生code")
            @RequestParam(value = "doctor", required = true) String doctor) {
            @RequestParam(value = "doctor", required = true) String doctor,
            @ApiParam(name = "code", value = "服务项类型", required = false)
            @RequestParam(value = "code",required = false) String code) {
        try {
            Map<String, Integer> map = lifeCareOrderService.getNumGroupByStatus(doctor);
            Map<String, Integer> map = lifeCareOrderService.getNumGroupByStatus(doctor,code);
            return ObjEnvelop.getSuccess("获取成功",map);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -213,13 +213,18 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @param doctor
     * @return
     */
    public Map<String, Integer> getNumGroupByStatus(String doctor) {
    public Map<String, Integer> getNumGroupByStatus(String doctor,String code) {
        List<BaseDoctorHospitalDO> doctorHospitalDOs = doctorHospitalDao.findByDoctorCode(doctor);
        String hospital = doctorHospitalDOs.get(0).getOrgCode();
        String filter = " ";
        if (StringUtils.isNotBlank(code)){
            filter = " and fed.code='"+code+"' ";
        }
        String sql = "SELECT a.status, COUNT(DISTINCT a.id) as num FROM base_life_care_order a " ;
        String sql = "SELECT a.status, COUNT(DISTINCT a.id) as num FROM base_life_care_order a " +
                " INNER JOIN base_life_care_fee_detail fed on a.id = fed.order_id " ;
        sql +=  "  WHERE  a.hospital = ? and a.pay_status>0 and a.status<>0 group BY a.status";
        sql +=  "  WHERE  a.hospital = ? and a.pay_status>0 and a.status<>0 "+filter+" group BY a.status";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, hospital);
        Map<String, Integer> map = new HashMap<>();
        //状态 待服务 1、已完成 2 、已取消 -1 已签到 3

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/DetectionPlatformService.java

@@ -619,7 +619,12 @@ public class DetectionPlatformService  {
     */
    public JSONObject getTopicPeopleNums(String area,String level){
        JSONObject result = new JSONObject();
        String sql = " select dict_code from wlyy_hospital_sys_dict where dict_name='security_topic_dict' ";
        List<String> sqlList = jdbcTemplate.queryForList(sql,String.class);
        for (String tmp:sqlList){
            result.put(tmp,0);
        }
        result.put("emergencyAssistance",0);
        String olderFilter = roleService.getOlderRoleSQL(area,level);
//        String filter = " ";
@@ -632,7 +637,7 @@ public class DetectionPlatformService  {
//                filter = " and pd.user not in ('" + orgCodes + "') ";
//            }
//        }
        String sql = " select count(DISTINCT pd.user) total,pd.category_code from wlyy_patient_device pd where pd.del=0  " +
        sql = " select count(DISTINCT pd.user) total,pd.category_code from wlyy_patient_device pd where pd.del=0  " +
                " and pd.category_code in (4,7,12,13,14,15) " + olderFilter.replace("{patient}","pd.user")+
                " group by pd.category_code ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);