Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistScreenResultService.java

@@ -37,7 +37,7 @@ public class SpecialistScreenResultService {
                "LEFT JOIN wlyy_specialist_patient_relation spr ON ssr.patient_code= spr.patient " +
                "LEFT JOIN "+basedb+".wlyy_patient p on p.`status` = 1 and ssr.patient_code = p.`code` " +
                "LEFT JOIN "+basedb+".wlyy_patient_reservation pr on pr.code = ssr.reservation_code " +
                "LEFT JOIN "+basedb+".wlyy_order_doctor_mapping d on on d.jw_doctor = pr.doctor_code " +
                "LEFT JOIN "+basedb+".wlyy_order_doctor_mapping d on d.jw_doctor = pr.doctor_code " +
        "WHERE ((spr.`status`>=0 AND spr.sign_status>0 AND spr.doctor='"+doctor+"') or (d.doctor = '"+doctor+"'))" +
                " AND ssr.over=1 and ssr.reservation_code is not null ";
        if (StringUtils.isNotBlank(isDanger)) {