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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -124,7 +124,7 @@ public class ConsultTeamService extends ConsultService {
                return findByDoctorType5(uid, id, pagesize, title);
            case 6:
                //6 名医咨询 进行中
                 return findByDoctorTypeSix(uid, id, pagesize, title);
                return findByDoctorType6(uid, 0, id, pagesize, title);
            case 7:
                //7 名医咨询 已结束
                return findByDoctorType6(uid, 1, id, pagesize, title);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1726,12 +1726,12 @@ public class FamilyContractService extends BaseService {
                " (select a.patient code from wlyy_sign_family a where a.type = 2 and a.status >= 1 and a.doctor_health is null and a.doctor='" + doctor + "' order by a.czrq desc ) ");
        if (!org.springframework.util.StringUtils.isEmpty(patientName)) {
            sql.append(" and name like '" + patientName + "%'");
            countSql.append(" and name like '" + patientName + "%'");
            sql.append(" and name like '%" + patientName + "%'");
            countSql.append(" and name like '%" + patientName + "%'");
        }
        if (!org.springframework.util.StringUtils.isEmpty(patientAddr)) {
            sql.append(" and address like '" + patientAddr + "%'");
            countSql.append(" and address like '" + patientAddr + "%'");
            sql.append(" and address like '%" + patientAddr + "%'");
            countSql.append(" and address like '%" + patientAddr + "%'");
        }
        sql.append(" limit " + start + "," + pagesize + "");
        List<Patient> returnList = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper(Patient.class));

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@@ -75,7 +75,7 @@ public class FileUploadController extends BaseController {
				//images.add(uploadFile);
				//tempPaths.add(datePath + newFileName);
			}
			String urls = SystemConf.getInstance().getImageServer()+firstPhoto;
			String urls = firstPhoto;
			JSONObject json = new JSONObject();
			json.put("status", 200);
			json.put("msg", "上传成功");