Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/PatientInfoService.java

@@ -1743,40 +1743,17 @@ public class PatientInfoService extends BaseService {
        }
    }
    /**
     *
     * @param keyWord
     * @param deviceSn
     * @param doctorId
     * @param isManage
     * @param level   3区  2社区 1团队
     * @param area
     * @param pageNo
     * @param pageSize
     * @return
     * @throws Exception
     */
    public List<Map<String,Object>> getPatientSignByNameOrIdCard(String keyWord,String deviceSn,int isManage,int level,String area,int pageNo,int pageSize)throws Exception{
        /* String sql = "SELECT p.code,p.name,CASE p.sex WHEN 1 THEN '男' WHEN 2 THEN '女' END sex,p.idcard,f.doctor_name" +
    public List<Map<String,Object>> getPatientSignByNameOrIdCard(String keyWord,String deviceSn,String doctorId,int pageNo,int pageSize)throws Exception{
        Doctor doctor = doctorDao.findByCode(doctorId);
        String hospital = doctor.getHospital();
        int start = (pageNo-1)*pageSize;
        List<Map<String,Object>> patientList = new ArrayList<>();
       /* String sql = "SELECT p.code,p.name,CASE p.sex WHEN 1 THEN '男' WHEN 2 THEN '女' END sex,p.idcard,f.doctor_name" +
                " FROM wlyy_patient p  LEFT JOIN wlyy_sign_family f ON p.code = f.patient" +
                " WHERE f.status = 1 AND p.name LIKE '%"+keyWord+"%' OR p.idcard LIKE '%"+keyWord+"%' and f.hospital = '"+hospital+"'"+" limit ?,?";*/
        String sql = "";
        List<Map<String,Object>> patientList = new ArrayList<>();
        if (isManage == 1 && level ==3){
            sql = "SELECT f.patient as code,f.name,f.idcard,f.doctor_name FROM wlyy_sign_family f where LEFT(f.hospital, 6) = '"+area+"'";
        }
        if (isManage==0 || (isManage==1 && level == 2)) {
            sql = "SELECT f.patient as code,f.name,f.idcard,f.doctor_name FROM wlyy_sign_family f where f.hospital = '" + area + "' and f.status > 0 ";
        }
        if (!StringUtils.isEmpty(keyWord)){
            sql += " AND f.name LIKE '%"+keyWord+"%' OR f.idcard LIKE '%"+keyWord+"%'";
        }
        sql += " limit ?,?";
        int start = (pageNo-1)*pageSize;
        String sql ="SELECT f.patient as code,f.name,f.idcard,f.doctor_name FROM wlyy_sign_family f where f.status > 0 AND f.hospital = '"+hospital+"' AND f.name LIKE '%"+keyWord+"%' OR f.idcard LIKE '%"+keyWord+"%' limit ?,?";
        patientList = jdbcTemplate.queryForList(sql ,new Object[]{start,pageSize});
        //判断是否有绑定过该设备的人
        String patientDeviceSql = "SELECT user as patientCode FROM wlyy_patient_device WHERE device_sn='"+deviceSn+"'";
        List<Map<String,Object>> patientDeviceList = jdbcTemplate.queryForList(patientDeviceSql);
        for (Map<String,Object> map : patientList){
@@ -1784,9 +1761,9 @@ public class PatientInfoService extends BaseService {
            map.put("sex",Constant.getLevelSexName(IdCardUtil.getSexForIdcard_new(String.valueOf(map.get("idcard")))));
            for (Map<String,Object> patientDeviceMap : patientDeviceList){
                if (String.valueOf(map.get("code")).equals(String.valueOf(patientDeviceMap.get("patientCode")))){
                    map.put("del",1);
                }else {
                    map.put("del",0);
                }else {
                    map.put("del",1);
                }
            }
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/PatientInfoController.java

@@ -528,13 +528,10 @@ public class PatientInfoController extends BaseController {
    @RequestMapping(value = "/getPatientSignByNameOrIdCard",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("在绑定设备的时候查找患者（带签约信息）")
    public String getPatientSignByNameOrIdCard(@ApiParam(value = "关键搜索词", name = "keyWord") @RequestParam(value = "keyWord",required = true,defaultValue = "")String keyWord,
                                                @ApiParam(value = "设备sn码", name = "deviceSn") @RequestParam(value = "deviceSn",required = true)String deviceSn,
                                                @ApiParam(value = "是否为管理员登录（0不是1是）", name = "isManage") @RequestParam(value = "isManage",required = true)String isManage,
                                                @ApiParam(value = "管理员地区权限level（3区  2社区）", name = "level") @RequestParam(value = "level",required = false,defaultValue = "0")String level,
                                                @ApiParam(value = "管理员地区code", name = "area") @RequestParam(value = "area",required = true)String area,
                                                @ApiParam(name="page",value="第几页",defaultValue = "1") @RequestParam(value="page",required = true) String page,
                                                @ApiParam(name="pageSize",value="",defaultValue = "10") @RequestParam(value="pageSize",required = true) String pageSize){
    public String getPatientSignByNameOrIdCard(@ApiParam(value = "关键搜索词", name = "keyWord") @RequestParam(value = "keyWord",required = true)String keyWord,
                                               @ApiParam(value = "设备sn码", name = "deviceSn") @RequestParam(value = "deviceSn",required = true)String deviceSn,
                                               @ApiParam(name="page",value="第几页",defaultValue = "1") @RequestParam(value="page",required = true) String page,
                                               @ApiParam(name="pageSize",value="",defaultValue = "10") @RequestParam(value="pageSize",required = true) String pageSize){
        if (StringUtils.isBlank(pageSize)) {
            pageSize = "10";
        }
@@ -542,11 +539,10 @@ public class PatientInfoController extends BaseController {
            page = "1";
        }
        try {
            return  write(200,"查找成功！","data",patientInfoService.getPatientSignByNameOrIdCard(keyWord,deviceSn,Integer.valueOf(isManage),Integer.valueOf(level),area,Integer.valueOf(page),Integer.valueOf(pageSize)));
            return  write(200,"查找成功！","data",patientInfoService.getPatientSignByNameOrIdCard(keyWord,deviceSn,getUID(),Integer.valueOf(page),Integer.valueOf(pageSize)));
        } catch (Exception e) {
            error(e);
            return error( -1, "查询失败！");
        }
    }
}