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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/interceptors/DoctorInterceptor.java

@@ -137,7 +137,7 @@ public class DoctorInterceptor extends BaseInterceptor {
                }
            }
            //  2、医生端app，3、微信公众号wechat,4、医生端pc，或者 PC端取药系统  或者对外系统
            if (token == null || (token.getPlatform() != 2 && token.getPlatform() != 4)) {
            if (token == null || (token.getPlatform() != 2 && token.getPlatform() != 4&&token.getPlatform()!=5)) {
                // 未登录
                response.getOutputStream().write(error(SystemConf.NOT_LOGIN, "请登录后再操作！").getBytes("UTF-8"));
                flag = false;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -905,7 +905,14 @@ public class PrescriptionInfoService extends BaseService {
                " LEFT(pr.create_time,19) AS createTime, " +
                " pr.doctor, " +
                " pr.dispensary_type AS dispensaryType ," +
                " e.expressage_name AS expressageName " +
                " e.expressage_code AS expressageCode, " +
                " e.expressage_name AS expressageName, " +
                " e.expressage_hospital_address AS expressageHospitalAddress, " +
                " e.expressage_hospital_name AS expressageHospitalName, " +
                " e.expressage_hospital_code AS expressageHospitalCode, " +
                " e.patient_hospital_address AS patientHospitalAddress, " +
                " e.patient_hospital_name AS patientHospitalName, " +
                " e.patient_hospital_code AS patientHospitalCode " +
                " FROM " +
                " wlyy_prescription pr " +
                " LEFT JOIN wlyy_patient p ON pr.patient = p.`code` " +
@@ -1583,9 +1590,10 @@ public class PrescriptionInfoService extends BaseService {
                " d.`code`," +
                " d.`name`," +
                " d.job," +
                " d.photo " +
                " d.photo," +
                " j.name AS jobName " +
                " FROM" +
                " wlyy_doctor d" +
                " wlyy_doctor d  LEFT JOIN dm_job j ON d.job = j.`code`" +
                " WHERE" +
                " d.hospital = ?" +
                " AND d.`level` = 3 " ;
@@ -1598,7 +1606,7 @@ public class PrescriptionInfoService extends BaseService {
        String totalSql = "SELECT " +
                " count(1) AS total" +
                " FROM" +
                " wlyy_doctor d" +
                " wlyy_doctor d " +
                " WHERE" +
                " d.hospital = ?" +
                " AND d.`level` = 3 ";

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

@@ -267,7 +267,7 @@ public class PrescriptionInfoController extends BaseController {
             @RequestParam(required = false) @ApiParam(value = "服务站", name = "hospital") String hospital,
             @RequestParam(required = false) @ApiParam(value = "配送状态", name = "state") String state) {
        try {
            return write(200, "操作成功！", "data", prescriptionInfoService.getHDoctorPrescriptionExpressageTotal(teamCode, type, getRepUID(), nameKey, startDate, endDate, hospital, state));
            return write(200, "操作成功！", "data", prescriptionInfoService.getHDoctorPrescriptionExpressageTotal(teamCode, type, getUID(), nameKey, startDate, endDate, hospital, state));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");