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

@@ -1756,7 +1756,7 @@ public class PatientInfoService extends BaseService {
     * @return
     * @throws Exception
     */
    public List<Map<String,Object>> getPatientSignByNameOrIdCard(String keyWord,String deviceSn,String doctorId,int isManage,int level,String area,int pageNo,int pageSize)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" +
                " 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 ?,?";*/

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

@@ -528,11 +528,11 @@ 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)String keyWord,
    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 = true)String level,
                                                @ApiParam(value = "管理员地区code", name = "area") @RequestParam(value = "area",required = false)String area,
                                                @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){
        if (StringUtils.isBlank(pageSize)) {
@@ -542,7 +542,7 @@ public class PatientInfoController extends BaseController {
            page = "1";
        }
        try {
            return  write(200,"查找成功！","data",patientInfoService.getPatientSignByNameOrIdCard(keyWord,deviceSn,getUID(),Integer.valueOf(isManage),Integer.valueOf(level),area,Integer.valueOf(page),Integer.valueOf(pageSize)));
            return  write(200,"查找成功！","data",patientInfoService.getPatientSignByNameOrIdCard(keyWord,deviceSn,Integer.valueOf(isManage),Integer.valueOf(level),area,Integer.valueOf(page),Integer.valueOf(pageSize)));
        } catch (Exception e) {
            error(e);
            return error( -1, "查询失败！");