Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -205,7 +205,11 @@ public class SignFamilyServiceService {
        }
        List<Service> ss = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper(Service.class));
        return ss.get(0);
        if (ss.size() > 0) {
            return ss.get(0);
        } else {
            return null;
        }
    }
    private SignFamily getSignFamily(String patient) {

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

@@ -260,7 +260,7 @@ public class ManagerUtilController extends BaseController {
            jo.put("doctor_online", SystemData.doctorTokens.size());
            jo.put("pc_online", SystemData.doctorPCTokens.size());
            jo.put("patient_online", SystemData.patientTokens.size());
            return write(200, "启动成功");
            return write(200, "启动成功","data",jo);
        } catch (Exception e) {
            return error(-1, "启动失败");
        }
@@ -292,7 +292,7 @@ public class ManagerUtilController extends BaseController {
            DoctorInterceptor.status = open;
            PatientInterceptor.status = open;
            GateWayInterceptor.status = open;
            return write(200, "关闭成功");
            return write(200, "开启成功");
        } catch (Exception e) {
            return error(-1, "启动失败");
        }