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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PadDeviceController.java

@@ -56,14 +56,12 @@ public class PadDeviceController extends BaseController {
    @RequestMapping(value = "PatientDeviceList", method = RequestMethod.GET)
    public String getDeviceByPatient(@ApiParam(name = "patientName", value = "居民姓名", defaultValue = "张")
                                     @RequestParam(value = "patientName", required = false) String patientName,
                                     @ApiParam(name = "idcard", value = "身份证号", defaultValue = "")
                                     @RequestParam(value = "idcard", required = false) String idcard,
                                     @ApiParam(name = "page", value = "分页起始id", defaultValue = "1")
                                     @RequestParam(value = "page", required = true) int page,
                                     @ApiParam(name = "pagesize", value = "每页条数", defaultValue = "10")
                                     @RequestParam(value = "pagesize", required = true) int pagesize) {
        try {
            List<Map<String , Object>> list = patientDeviceService.findDeviceFromAdmin(patientName, idcard, page, pagesize);
            List<Map<String , Object>> list = patientDeviceService.findDeviceFromAdmin(patientName, page, pagesize);
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
@@ -74,10 +72,9 @@ public class PadDeviceController extends BaseController {
    @ApiOperation("平板端，添加设备时获取设备类型（大类）")
    @RequestMapping(value = "getDeviceTypeBig", method = RequestMethod.GET)
    public String getDeviceTypeBig(@ApiParam(name = "pyCode", value = "获取设备类型（默认为null，获取大类）", defaultValue = "")
                                       @RequestParam(value = "pyCode", required = false) String pyCode) {
    public String getDeviceTypeBig() {
        try {
            List<Map<String , Object>> list = patientDeviceService.getDeviceType(1,pyCode);
            List<Map<String , Object>> list = patientDeviceService.getDeviceType();
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
            error(ex);
@@ -87,10 +84,10 @@ public class PadDeviceController extends BaseController {
    @ApiOperation("平板端，添加设备时获取设备类型（小类）")
    @RequestMapping(value = "getDeviceTypeSmall", method = RequestMethod.GET)
    public String getDeviceTypeSmall(@ApiParam(name = "pyCode", value = "获取设备类型（默认为 watch，获取小类(智能手表多类型)）", defaultValue = "watch")
                                         @RequestParam(value = "pyCode", required = false) String pyCode) {
    public String getDeviceTypeSmall(@ApiParam(name = "category_code", value = "category_code", defaultValue = "4")
                                         @RequestParam(value = "category_code", required = false) String category_code) {
        try {
            List<Map<String , Object>> list = patientDeviceService.getDeviceType(0,pyCode);
            List<Map<String , Object>> list = patientDeviceService.getDeviceTypeSmall(category_code);
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
            error(ex);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/sign/SignEndpoint.java

@@ -530,4 +530,16 @@ public class SignEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getError("查询失败");
        }
    }
    @GetMapping(value="findAllSignPatient")
    @ApiOperation(value = "获取签约居民根据身份证或姓名")
    public ListEnvelop findAllSignPatient(@ApiParam(name="name",value = "姓名或身份证",required = false)
                                           @RequestParam(value = "name")String name){
        try {
            return ListEnvelop.getSuccess("查询成功",servicePackageService.findAllSignPatient(name));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -250,25 +250,36 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
        return patientDeviceDao.findAll(spec, pageRequest);
    }
    public List<Map<String , Object>> findDeviceFromAdmin(String patientName, String Idcard, int page, int pageSize) {
        String sql = "select p.id,p.`name`,pd.device_id deviceId,pd.category_code categoryCode,pd.device_name deviceName,pd.device_sn deviceSn,pd.czrq,pd.doctor,\n" +
                "pd.doctor_name doctorName,pd.agent,pd.agent_name agentName from wlyy_patient_device pd,base_patient p where p.id = pd.`user`";
    public List<Map<String , Object>> findDeviceFromAdmin(String patientName, int page, int pageSize) {
        String sql = "select p.id,p.`name`,dd.photo,pd.device_id deviceId,pd.category_code categoryCode,pd.device_name deviceName,pd.device_sn deviceSn,pd.czrq,pd.doctor,\n" +
                "pd.doctor_name doctorName,pd.agent,pd.agent_name agentName from wlyy_patient_device pd,base_patient p,dm_device dd where p.id = pd.`user` and pd.category_code = dd.category_code";
        if (StringUtils.isNotBlank(patientName)){
            sql += " AND p.`name` LIKE '%" + patientName +"%'";
        }
        if (StringUtils.isNotBlank(Idcard)){
            sql += " AND p.idcard LIKE '%" + Idcard + "%'";
            sql += " AND (p.`name` LIKE '%" + patientName +"%' or  p.idcard LIKE '%" + patientName + "%') ";
        }
        sql += " ORDER BY pd.czrq DESC LIMIT "+ (page-1)*pageSize +" , " + pageSize + " ";
        List<Map<String , Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
    public List<Map<String , Object>> getDeviceType(int type,String pyCode) {
        String sql = "SELECT * FROM base_system_dict WHERE saas_id = 'device_type' AND type = "+type+"";
        if (StringUtils.isNotBlank(pyCode)){
            sql += " and py_code = '"+pyCode+"' " ;
        }
    public List<Map<String , Object>> getDeviceType() {
        String sql = "select *,case \n" +
                "when category_code=4 then '智能手表'\n" +
                "when category_code=7 then '报警器'\n" +
                "else '未知'\n" +
                "end as categoryName\n" +
                " from dm_device where del=1 GROUP BY category_code ";
        List<Map<String , Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
    public List<Map<String , Object>> getDeviceTypeSmall(String category_code) {
        String sql = "select *,case \n" +
                "when category_code=4 then '智能手表'\n" +
                "when category_code=7 then '报警器'\n" +
                "else '未知'\n" +
                "end as categoryName\n" +
                " from dm_device where del=1 and category_code='"+category_code+"' GROUP BY model ";
        List<Map<String , Object>> list = jdbcTemplate.queryForList(sql);
        return list;

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

@@ -32,6 +32,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.print.DocFlavor;
import java.util.*;
import java.util.stream.Collectors;
@@ -511,4 +512,16 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        return result;
    }
    public List<Map<String,Object>> findAllSignPatient(String name){
        String sql ="SELECT distinct p.id,p.name,p.sex,p.idcard,p.photo,p.mobile from base_service_package_sign_record sr,base_service_package_record r, \n" +
                "base_service_package_item i,base_patient p\n" +
                "WHERE sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id\n" +
                "and sr.patient = p.id\n" +
                "and i.del = 1 and sr.`status`=1 ";
        if (StringUtils.isNotBlank(name)){
            sql+=" and (p.name like '%"+name+"%' or p.idcard like '%"+name+"%') ";
        }
        return jdbcTemplate.queryForList(sql);
    }
}