云照护修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/sign/ServiceItemConfigDao.java

@@ -0,0 +1,18 @@
package com.yihu.jw.care.dao.sign;
import com.yihu.jw.entity.base.servicePackage.ServiceItemConfig;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
/**
 *
 * @author yeshijie on 2018/8/17.
 */
public interface ServiceItemConfigDao extends JpaRepository<ServiceItemConfig, String>, JpaSpecificationExecutor<ServiceItemConfig> {
    @Query("from ServiceItemConfig w where w.packageId =?1 ")
    List<ServiceItemConfig> findByPackageId(String packageId);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ServicePackageService.java

@@ -94,6 +94,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    private MessageUtil messageUtil;
    @Autowired
    private BusinessOrderDao businessOrderDao;
    @Autowired
    private ServiceItemConfigDao serviceItemConfigDao;
    //我的医养团队
    public List<Map<String,Object>> mySignDoctor(String patientId){
@@ -233,13 +235,12 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        String sql = "SELECT DISTINCT ar.level_conclusion,di2.dict_value levelConclusionName,p.id" +
                ",p.`name`,p.sex,p.mobile,p.idcard,p.birthday,p.openid,p.photo ";
        String filter = " from base_patient p  " +
                " inner JOIN base_service_package_sign_record r on p.id = r.patient and r.status=1 " +
                " LEFT JOIN base_capacity_assessment_record ar on ar.patient = p.id and ar.assessment_time>= '" + DateUtil.getNowYear() + "-01-01' " +
                " LEFT JOIN wlyy_hospital_sys_dict di2 on di2.dict_name = 'level_conclusion' and di2.dict_code=ar.level_conclusion " +
                " where 1=1 ";
        filter += " and r.patient = '"+patient+"' ";
                " where p.id = '"+patient+"' limit 1";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filter);
        String packageSql = "SELECT r.id,DATE_FORMAT(r.end_time,'%Y-%m-%d %H:%i:%S') endTime,r.type,p.`name`,p.num from base_service_package_sign_record r,base_service_package p " +
        String packageSql = "SELECT r.id,DATE_FORMAT(r.end_time,'%Y-%m-%d %H:%i:%S') endTime,r.type,p.`name`,p.num,p.org_name orgName " +
                "from base_service_package_sign_record r,base_service_package p " +
                "WHERE r.patient =? and r.`status`=1 and r.service_package_id=p.id ";
        for (Map<String,Object> map:list){
            String idcard = map.get("idcard")+"";
@@ -248,7 +249,10 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            List<Map<String,Object>> packageList = jdbcTemplate.queryForList(packageSql,new Object[]{patient});
            map.put("packageList",packageList);
        }
        return list.get(0);
        if(list.size()>0){
            return list.get(0);
        }
        return null;
    }
    /**
@@ -272,7 +276,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        }
        String oderBy = " order by r.id desc limit "+(page-1)*size+","+size;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filter+oderBy);
        String packageSql = "SELECT r.id,DATE_FORMAT(r.end_time,'%Y-%m-%d %H:%i:%S') endTime,r.type,p.`name`,p.num from base_service_package_sign_record r,base_service_package p " +
        String packageSql = "SELECT r.id,DATE_FORMAT(r.end_time,'%Y-%m-%d %H:%i:%S') endTime,r.type,p.`name`,p.num,p.org_name orgName " +
                "from base_service_package_sign_record r,base_service_package p " +
                "WHERE r.patient =? and r.`status`=1 and r.service_package_id=p.id ";
        for (Map<String,Object> map:list){
            String id = map.get("id")+"";
@@ -556,9 +561,17 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    //服务包详情
    public ServicePackageDO servicePackageInfo(String id){
        ServicePackageDO packageDO = servicePackageDao.findOne(id);
        if(packageDO==null){
            return null;
        }
        String itemSql = "SELECT i.*,c.server_count serverCount from base_service_package_item i " +
                "LEFT JOIN base_service_item_config c on i.id=c.server_item_id WHERE i.service_package_id='"+id+"' ";
        List<ServicePackageItemDO> itemDOList = jdbcTemplate.query(itemSql,new BeanPropertyRowMapper<>(ServicePackageItemDO.class));
        List<ServiceItemConfig> itemConfigList = serviceItemConfigDao.findByPackageId(id);
        Map<String,ServiceItemConfig> itemConfigMap = itemConfigList.stream().collect(Collectors.toMap(ServiceItemConfig::getServerItemId, v -> v, (p1, p2) -> p1));
        for (ServicePackageItemDO itemDO:itemDOList){
            itemDO.setItemConfig(itemConfigMap.get(itemDO.getId()));
        }
        packageDO.setPackageItemDOList(itemDOList);
        return packageDO;
    }